diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index e7a8f5fe228ed04a408e3165f7980dbe17b92dc3..9a1120ffd895b51c45746721526c41e82a4665b4 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -8783,7 +8783,8 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
         SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
 
         int32_t f = pExpr->base.functionId;
-        if (f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE || f == TSDB_FUNC_RATE || f== TSDB_FUNC_DIFF) {
+        if (f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE || 
+            f == TSDB_FUNC_RATE       || f == TSDB_FUNC_DIFF) {
           return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
         }
       }
diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index c18597c7db21ed3f36553d5ba531347afbb639ee..d93c0ce89582295557d90128e6484f6a5fe9ac2e 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -448,13 +448,14 @@ typedef struct {
 #define kvRowSetNCols(r, n) kvRowNCols(r) = (n)
 #define kvRowColIdx(r) (SColIdx *)POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE)
 #define kvRowValues(r) POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE + sizeof(SColIdx) * kvRowNCols(r))
+#define kvRowKeys(r) POINTER_SHIFT(r, *(uint16_t *)POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE + sizeof(int16_t)))
 #define kvRowCpy(dst, r) memcpy((dst), (r), kvRowLen(r))
 #define kvRowColVal(r, colIdx) POINTER_SHIFT(kvRowValues(r), (colIdx)->offset)
 #define kvRowColIdxAt(r, i) (kvRowColIdx(r) + (i))
 #define kvRowFree(r) tfree(r)
 #define kvRowEnd(r) POINTER_SHIFT(r, kvRowLen(r))
 #define kvRowValLen(r) (kvRowLen(r) - TD_KV_ROW_HEAD_SIZE - sizeof(SColIdx) * kvRowNCols(r))
-#define kvRowTKey(r) (*(TKEY *)(kvRowValues(r)))
+#define kvRowTKey(r) (*(TKEY *)(kvRowKeys(r)))
 #define kvRowKey(r) tdGetKey(kvRowTKey(r))
 #define kvRowDeleted(r) TKEY_IS_DELETED(kvRowTKey(r))
 
@@ -652,7 +653,7 @@ static FORCE_INLINE char *memRowEnd(SMemRow row) {
 #define memRowKvVersion(r) (*(int16_t *)POINTER_SHIFT(r, TD_MEM_ROW_TYPE_SIZE))
 #define memRowVersion(r) (isDataRow(r) ? memRowDataVersion(r) : memRowKvVersion(r))  // schema version
 #define memRowSetKvVersion(r, v) (memRowKvVersion(r) = (v))
-#define memRowTuple(r) (isDataRow(r) ? dataRowTuple(memRowDataBody(r)) : kvRowValues(memRowKvBody(r)))
+#define memRowKeys(r) (isDataRow(r) ? dataRowTuple(memRowDataBody(r)) : kvRowKeys(memRowKvBody(r)))
 
 #define memRowTKey(r) (isDataRow(r) ? dataRowTKey(memRowDataBody(r)) : kvRowTKey(memRowKvBody(r)))
 #define memRowKey(r) (isDataRow(r) ? dataRowKey(memRowDataBody(r)) : kvRowKey(memRowKvBody(r)))
diff --git a/src/connector/python/taos/cinterface.py b/src/connector/python/taos/cinterface.py
index a1b6fe312b5725b8bf030701608d93c3e0c85706..a9bdba33e8212b7a32ef2c6b518aef03aed3f50a 100644
--- a/src/connector/python/taos/cinterface.py
+++ b/src/connector/python/taos/cinterface.py
@@ -103,7 +103,7 @@ _libtaos.taos_get_client_info.restype = c_char_p
 def taos_get_client_info():
     # type: () -> str
     """Get client version info."""
-    return _libtaos.taos_get_client_info().decode()
+    return _libtaos.taos_get_client_info().decode("utf-8")
 
 
 _libtaos.taos_get_server_info.restype = c_char_p
@@ -113,7 +113,7 @@ _libtaos.taos_get_server_info.argtypes = (c_void_p,)
 def taos_get_server_info(connection):
     # type: (c_void_p) -> str
     """Get server version as string."""
-    return _libtaos.taos_get_server_info(connection).decode()
+    return _libtaos.taos_get_server_info(connection).decode("utf-8")
 
 
 _libtaos.taos_close.restype = None
diff --git a/src/connector/python/taos/field.py b/src/connector/python/taos/field.py
index b0bec58b932f2136b868739bb28fca04de759e3f..f6fa28e8336fa53a137ce7bd9a25b99a32263f1b 100644
--- a/src/connector/python/taos/field.py
+++ b/src/connector/python/taos/field.py
@@ -144,7 +144,7 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, precision=FieldType.C_
         try:
             if num_of_rows >= 0:
                 tmpstr = ctypes.c_char_p(data)
-                res.append(tmpstr.value.decode())
+                res.append(tmpstr.value.decode("utf-8"))
             else:
                 res.append(
                     (
@@ -172,7 +172,7 @@ def _crow_binary_to_python_block(data, num_of_rows, nbytes=None, precision=Field
         if rbyte == 1 and buffer[0] == b'\xff':
             res.append(None)
         else:
-            res.append(cast(buffer, c_char_p).value.decode())
+            res.append(cast(buffer, c_char_p).value.decode("utf-8"))
     return res
 
 
@@ -188,7 +188,7 @@ def _crow_nchar_to_python_block(data, num_of_rows, nbytes=None, precision=FieldT
         if rbyte == 4 and buffer[:4] == b'\xff'*4:
             res.append(None)
         else:
-            res.append(cast(buffer, c_char_p).value.decode())
+            res.append(cast(buffer, c_char_p).value.decode("utf-8"))
     return res
 
 
diff --git a/src/connector/python/taos/result.py b/src/connector/python/taos/result.py
index 81151733615d1b7fdc3318b6e53888ae39d32b14..8881c26ca94edfd4ed3a5042bebbc327f06b82ac 100644
--- a/src/connector/python/taos/result.py
+++ b/src/connector/python/taos/result.py
@@ -3,6 +3,8 @@ from .cinterface import *
 # from .connection import TaosConnection
 from .error import *
 
+from ctypes import c_void_p
+
 
 class TaosResult(object):
     """TDengine result interface"""
@@ -12,7 +14,11 @@ class TaosResult(object):
         # to make the __del__ order right
         self._conn = conn
         self._close_after = close_after
-        self._result = result
+        if isinstance(result, c_void_p):
+            self._result = result
+        else:
+            self._result = c_void_p(result)
+
         self._fields = None
         self._field_count = None
         self._precision = None
diff --git a/src/connector/python/tests/test_lines.py b/src/connector/python/tests/test_lines.py
index bd9d2cdb39d6f4f2612581ce7284c057c456ef91..c9b581e8bcb0d300ade8cb991ba648efc2550f8a 100644
--- a/src/connector/python/tests/test_lines.py
+++ b/src/connector/python/tests/test_lines.py
@@ -36,7 +36,6 @@ def test_insert_lines(conn):
         conn.insert_lines(lines)
         print("inserted")
         result = conn.query("select * from st")
-        print(*result.fields)
         all = result.rows_iter()
         for row in all:
             print(row)
diff --git a/src/connector/python/tests/test_stmt.py b/src/connector/python/tests/test_stmt.py
index 938ba10eb3d2377a63f7972deb99dbd47f7de1b2..3368ecb6a9336a4295790f2cd55314ac9bb6290e 100644
--- a/src/connector/python/tests/test_stmt.py
+++ b/src/connector/python/tests/test_stmt.py
@@ -1,3 +1,4 @@
+# encoding:UTF-8
 from taos import *
 
 from ctypes import *
diff --git a/src/connector/python/tests/test_stream.py b/src/connector/python/tests/test_stream.py
index de6e20928b176e51bc6d350fb01268459f4e7f95..32ec4c5999c975be907cf69a42a04b5f4dd5d54c 100644
--- a/src/connector/python/tests/test_stream.py
+++ b/src/connector/python/tests/test_stream.py
@@ -20,7 +20,8 @@ def stream_callback(p_param, p_result, p_row):
     result = TaosResult(p_result)
     row = TaosRow(result, p_row)
     try:
-        ts, count = row()
+        ts, count = row.as_tuple()
+        print(ts, count)
         p = cast(p_param, POINTER(Counter))
         p.contents.count += count
         print("[%s] inserted %d in 5s, total count: %d" % (ts.strftime("%Y-%m-%d %H:%M:%S"), count, p.contents.count))
diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c
index b3d08aef20a7fd4270b28dc26833282817c327e1..be074bff83ec1c3fb5708fad6aac0afa33684a0e 100644
--- a/src/tsdb/src/tsdbMemTable.c
+++ b/src/tsdb/src/tsdbMemTable.c
@@ -560,7 +560,7 @@ static void tsdbFreeTableData(STableData *pTableData) {
   }
 }
 
-static char *tsdbGetTsTupleKey(const void *data) { return memRowTuple((SMemRow)data); }
+static char *tsdbGetTsTupleKey(const void *data) { return memRowKeys((SMemRow)data); }
 
 static int tsdbAdjustMemMaxTables(SMemTable *pMemTable, int maxTables) {
   ASSERT(pMemTable->maxTables < maxTables);
diff --git a/tests/examples/python/taosdemo/taosdemo.py b/tests/examples/python/taosdemo/taosdemo.py
index d55023bdbf119544a788aa6246c9d63dbf024872..4aaf00157c5fe5bbeec27b001f663a94c1d89439 100755
--- a/tests/examples/python/taosdemo/taosdemo.py
+++ b/tests/examples/python/taosdemo/taosdemo.py
@@ -21,78 +21,91 @@ import json
 import random
 import time
 import datetime
+import multiprocessing
 from multiprocessing import Manager, Pool, Lock
 from multipledispatch import dispatch
 from concurrent.futures import ThreadPoolExecutor, wait, ALL_COMPLETED
 
 
 @dispatch(str, str)
-def v_print(msg: str, arg: str):
+def v_print(msg, arg):
+    # type: (str, str) -> None
     if verbose:
         print(msg % arg)
 
 
 @dispatch(str, str, str)
-def v_print(msg: str, arg1: str, arg2: str):
+def v_print(msg, arg1, arg2):
+    # type: (str, str, str) -> None
     if verbose:
         print(msg % (arg1, arg2))
 
 
 @dispatch(str, str, str, str)
-def v_print(msg: str, arg1: str, arg2: str, arg3: str):
+def v_print(msg, arg1, arg2, arg3):
+    # type: (str, str, str, str) -> None
     if verbose:
         print(msg % (arg1, arg2, arg3))
 
 
 @dispatch(str, str, str, str, str)
-def v_print(msg: str, arg1: str, arg2: str, arg3: str, arg4: str):
+def v_print(msg, arg1, arg2, arg3, arg4):
+    # type: (str, str, str, str, str) -> None
     if verbose:
         print(msg % (arg1, arg2, arg3, arg4))
 
 
 @dispatch(str, int)
-def v_print(msg: str, arg: int):
+def v_print(msg, arg):
+    # type: (str, int) -> None
     if verbose:
         print(msg % int(arg))
 
 
 @dispatch(str, int, str)
-def v_print(msg: str, arg1: int, arg2: str):
+def v_print(msg, arg1, arg2):
+    # type: (str, int, str) -> None
     if verbose:
         print(msg % (int(arg1), str(arg2)))
 
 
 @dispatch(str, str, int)
-def v_print(msg: str, arg1: str, arg2: int):
+def v_print(msg, arg1, arg2):
+    # type: (str, str, int) -> None
     if verbose:
         print(msg % (arg1, int(arg2)))
 
 
 @dispatch(str, int, int)
-def v_print(msg: str, arg1: int, arg2: int):
+def v_print(msg, arg1, arg2):
+    # type: (str, int, int) -> None
     if verbose:
         print(msg % (int(arg1), int(arg2)))
 
 
 @dispatch(str, int, int, str)
-def v_print(msg: str, arg1: int, arg2: int, arg3: str):
+def v_print(msg, arg1, arg2, arg3):
+    # type: (str, int, int, str) -> None
     if verbose:
         print(msg % (int(arg1), int(arg2), str(arg3)))
 
 
 @dispatch(str, int, int, int)
-def v_print(msg: str, arg1: int, arg2: int, arg3: int):
+def v_print(msg, arg1, arg2, arg3):
+    # type: (str, int, int, int) -> None
     if verbose:
         print(msg % (int(arg1), int(arg2), int(arg3)))
 
 
 @dispatch(str, int, int, int, int)
-def v_print(msg: str, arg1: int, arg2: int, arg3: int, arg4: int):
+def v_print(msg, arg1, arg2, arg3, arg4):
+    # type: (str, int, int, int, int) -> None
     if verbose:
         print(msg % (int(arg1), int(arg2), int(arg3), int(arg4)))
 
 
-def restful_execute(host: str, port: int, user: str, password: str, cmd: str):
+def restful_execute(host, port, user, password, cmd):
+    # type: (str, int, str, str, str) -> None
     url = "http://%s:%d/rest/sql" % (host, restPort)
 
     v_print("restful_execute - cmd: %s", cmd)
@@ -112,7 +125,8 @@ def restful_execute(host: str, port: int, user: str, password: str, cmd: str):
         print("resp: %s" % json.dumps(resp.json()))
 
 
-def query_func(process: int, thread: int, cmd: str):
+def query_func(process, thread, cmd):
+    # type: (int, int, str) -> None
     v_print("%d process %d thread cmd: %s", process, thread, cmd)
 
     if oneMoreHost != "NotSupported" and random.randint(
@@ -133,7 +147,8 @@ def query_func(process: int, thread: int, cmd: str):
                 host, port, user, password, cmd)
 
 
-def query_data_process(cmd: str):
+def query_data_process(cmd):
+    # type: (str) -> None
     # establish connection if native
     if native:
         v_print("host:%s, user:%s passwd:%s configDir:%s ", host, user, password, configDir)
@@ -256,7 +271,8 @@ def drop_databases():
                 (dbName, i))
 
 
-def insert_func(process: int, thread: int):
+def insert_func(process, thread):
+    # type: (int, int) -> None
     v_print("%d process %d thread, insert_func ", process, thread)
 
     # generate uuid
@@ -374,7 +390,8 @@ def create_tb():
                     (tbName, j))
 
 
-def insert_data_process(lock, i: int, begin: int, end: int):
+def insert_data_process(lock, i, begin, end):
+    # type: (multiprocessing._LockType, int, int, int) -> None
     lock.acquire()
     tasks = end - begin
     v_print("insert_data_process:%d table from %d to %d, tasks %d", i, begin, end, tasks)
@@ -675,7 +692,10 @@ if __name__ == "__main__":
         printConfig()
 
     if not skipPrompt:
-        input("Press any key to continue..")
+        try:
+            input("Press any key to continue..")
+        except SyntaxError:
+            pass
 
     # establish connection first if native
     if native:
diff --git a/tests/pytest/fulltest.bat b/tests/pytest/fulltest.bat
index 6eac17ad2e53a31d48acc37f856a607f78304d6f..535aafe2d4692f4dc85756256390502c5fd96efd 100644
--- a/tests/pytest/fulltest.bat
+++ b/tests/pytest/fulltest.bat
@@ -19,4 +19,3 @@ python .\test.py -f query\filterFloatAndDouble.py
 python .\test.py -f query\filterOtherTypes.py 
 python .\test.py -f query\querySort.py 
 python .\test.py -f query\queryJoin.py 
-python .\test.py -f tools\windows_input.py
\ No newline at end of file
diff --git a/tests/pytest/tools/windows_input.py b/tests/pytest/tools/windows_input.py
index 72f50a5acfa8b65c99b29a3beb55d384ad5c5dd6..99e30fa311673903850149c1916c6466c6a29ee5 100644
--- a/tests/pytest/tools/windows_input.py
+++ b/tests/pytest/tools/windows_input.py
@@ -15,6 +15,7 @@ import os
 from uiautomation import WindowControl
 from util.cases import *
 from util.sql import *
+import clipboard
 
 
 class TDTestCase:
@@ -55,16 +56,22 @@ class TDTestCase:
         sql = "insert into db.tb values(now,'%s');" % temp
         window.SendKeys(sql)
         window.SendKeys('{Enter}')
+        window.SendKeys('{Ctrl}A')
+        window.SendKeys('{Ctrl}C')
+        # 获取剪切板里面的复制内容
+        result = clipboard.paste()
         window.SendKeys('{Ctrl}C')
         window.SendKeys('exit')
         window.SendKeys('{Enter}')
+        return result
 
     def run(self):
         tdSql.prepare()
 
         ret = tdSql.execute('create table tb (ts timestamp, i binary(300))')
 
-        self.win_input_test()
+        result = self.win_input_test()
+        tdLog.info(result)
 
         tdSql.query("select * from tb")
         tdSql.checkRows(1)
diff --git a/tests/script/general/parser/nestquery.sim b/tests/script/general/parser/nestquery.sim
index 79052c3ea452fd6b70588030e2ec21c0570f2415..5bbdace4da0cb65b4573e2f9cd93b53ac28f6c2f 100644
--- a/tests/script/general/parser/nestquery.sim
+++ b/tests/script/general/parser/nestquery.sim
@@ -330,9 +330,9 @@ if $data12 != 71680.000000000 then
   return -1
 endi
 
-sql select top(x, 20) from (select c1 x from nest_tb0);
+sql select top(x, 20) from (select ts,c1 x from nest_tb0);
 
-sql select bottom(x, 20) from (select c1 x from nest_tb0)
+sql select bottom(x, 20) from (select ts,c1 x from nest_tb0)
 
 print ===================> group by + having
 
@@ -407,12 +407,14 @@ if $data03 != @20-09-15 00:00:00.000@ then
   return -1
 endi
 
+sql_error select diff(val) from (select c1 val from nest_tb0);
+
 sql select diff(val) from (select ts,c1 val from nest_tb0);
 if $rows != 9999 then
   return -1
 endi
 
-if $data00 != @70-01-01 08:00:00.000@ then
+if $data00 != @20-09-15 00:01:00.000@ then
   return -1
 endi