From 92ca5ded0d222f4914876b745a6428d0dc276f75 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Thu, 3 Dec 2020 16:19:56 +0800
Subject: [PATCH 1/3] [TD-785]Improve the robustness of python connector

---
 src/connector/python/linux/python2/taos/__init__.py     | 2 +-
 src/connector/python/linux/python2/taos/cinterface.py   | 2 ++
 src/connector/python/linux/python3/taos/__init__.py     | 4 ++--
 src/connector/python/linux/python3/taos/cinterface.py   | 2 ++
 src/connector/python/windows/python2/taos/__init__.py   | 2 +-
 src/connector/python/windows/python2/taos/cinterface.py | 2 ++
 src/connector/python/windows/python3/taos/__init__.py   | 2 +-
 src/connector/python/windows/python3/taos/cinterface.py | 2 ++
 8 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/connector/python/linux/python2/taos/__init__.py b/src/connector/python/linux/python2/taos/__init__.py
index 4894488bc8..5d21671eed 100644
--- a/src/connector/python/linux/python2/taos/__init__.py
+++ b/src/connector/python/linux/python2/taos/__init__.py
@@ -3,7 +3,7 @@ from .connection import TDengineConnection
 from .cursor import TDengineCursor
 
 # Globals
-apilevel = '2.0'
+apilevel = '2.0.2'
 threadsafety = 0
 paramstyle = 'pyformat'
 
diff --git a/src/connector/python/linux/python2/taos/cinterface.py b/src/connector/python/linux/python2/taos/cinterface.py
index 6f0435722f..2b1b29ee31 100644
--- a/src/connector/python/linux/python2/taos/cinterface.py
+++ b/src/connector/python/linux/python2/taos/cinterface.py
@@ -81,6 +81,7 @@ def _crow_double_to_python(data, num_of_rows, nbytes=None, micro=False):
 def _crow_binary_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
+    assert(nbytes is not None)
     if num_of_rows > 0:
         return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)]]
     else:
@@ -106,6 +107,7 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
 def _crow_binary_to_python_block(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
+    assert(nbytes is not None)
     res=[]
     if num_of_rows > 0:
         for i in range(abs(num_of_rows)):
diff --git a/src/connector/python/linux/python3/taos/__init__.py b/src/connector/python/linux/python3/taos/__init__.py
index 4894488bc8..c46131eeaf 100644
--- a/src/connector/python/linux/python3/taos/__init__.py
+++ b/src/connector/python/linux/python3/taos/__init__.py
@@ -3,7 +3,7 @@ from .connection import TDengineConnection
 from .cursor import TDengineCursor
 
 # Globals
-apilevel = '2.0'
+apilevel = '2.0.2'
 threadsafety = 0
 paramstyle = 'pyformat'
 
@@ -21,4 +21,4 @@ def connect(*args, **kwargs):
 
     @rtype: TDengineConnector
     """
-    return TDengineConnection(*args, **kwargs)
\ No newline at end of file
+    return TDengineConnection(*args, **kwargs)
diff --git a/src/connector/python/linux/python3/taos/cinterface.py b/src/connector/python/linux/python3/taos/cinterface.py
index bbf5a0c714..fdebe349fe 100644
--- a/src/connector/python/linux/python3/taos/cinterface.py
+++ b/src/connector/python/linux/python3/taos/cinterface.py
@@ -81,6 +81,7 @@ def _crow_double_to_python(data, num_of_rows, nbytes=None, micro=False):
 def _crow_binary_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
+    assert(nbytes is not None)
     if num_of_rows > 0:
         return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)]]
     else:
@@ -106,6 +107,7 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
 def _crow_binary_to_python_block(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
+    assert(nbytes is not None)
     res=[]
     if num_of_rows > 0:
         for i in range(abs(num_of_rows)):
diff --git a/src/connector/python/windows/python2/taos/__init__.py b/src/connector/python/windows/python2/taos/__init__.py
index 4894488bc8..5d21671eed 100644
--- a/src/connector/python/windows/python2/taos/__init__.py
+++ b/src/connector/python/windows/python2/taos/__init__.py
@@ -3,7 +3,7 @@ from .connection import TDengineConnection
 from .cursor import TDengineCursor
 
 # Globals
-apilevel = '2.0'
+apilevel = '2.0.2'
 threadsafety = 0
 paramstyle = 'pyformat'
 
diff --git a/src/connector/python/windows/python2/taos/cinterface.py b/src/connector/python/windows/python2/taos/cinterface.py
index d4bf1a0350..14f4f49be8 100644
--- a/src/connector/python/windows/python2/taos/cinterface.py
+++ b/src/connector/python/windows/python2/taos/cinterface.py
@@ -81,6 +81,7 @@ def _crow_double_to_python(data, num_of_rows, nbytes=None, micro=False):
 def _crow_binary_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
+    assert(nbytes is not None)
     if num_of_rows > 0:
         return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)]]
     else:
@@ -106,6 +107,7 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
 def _crow_binary_to_python_block(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
+    assert(nbytes is not None)
     res=[]
     if num_of_rows > 0:
         for i in range(abs(num_of_rows)):
diff --git a/src/connector/python/windows/python3/taos/__init__.py b/src/connector/python/windows/python3/taos/__init__.py
index 2fec471a1a..0708b9544f 100644
--- a/src/connector/python/windows/python3/taos/__init__.py
+++ b/src/connector/python/windows/python3/taos/__init__.py
@@ -3,7 +3,7 @@ from .connection import TDengineConnection
 from .cursor import TDengineCursor
 
 # Globals
-apilevel = '2.0'
+apilevel = '2.0.2'
 threadsafety = 0
 paramstyle = 'pyformat'
 
diff --git a/src/connector/python/windows/python3/taos/cinterface.py b/src/connector/python/windows/python3/taos/cinterface.py
index fb1b65fc15..42b820ca80 100644
--- a/src/connector/python/windows/python3/taos/cinterface.py
+++ b/src/connector/python/windows/python3/taos/cinterface.py
@@ -81,6 +81,7 @@ def _crow_double_to_python(data, num_of_rows, nbytes=None, micro=False):
 def _crow_binary_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
+    assert(nbytes is not None)
     if num_of_rows > 0:
         return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)]]
     else:
@@ -108,6 +109,7 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
 def _crow_binary_to_python_block(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
+    assert(nbytes is not None)
     res=[]
     if num_of_rows > 0:
         for i in range(abs(num_of_rows)):

From 1993ad245fb7adc8f3af3671c8917f3d776355ea Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 4 Dec 2020 11:16:42 +0800
Subject: [PATCH 2/3] [TD-785]Improve the robustness of python connector

---
 src/connector/python/linux/python2/taos/cursor.py   | 4 ++--
 src/connector/python/linux/python3/taos/cursor.py   | 4 ++--
 src/connector/python/windows/python2/taos/cursor.py | 4 ++--
 src/connector/python/windows/python3/taos/cursor.py | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/connector/python/linux/python2/taos/cursor.py b/src/connector/python/linux/python2/taos/cursor.py
index eee5e39488..82a01be671 100644
--- a/src/connector/python/linux/python2/taos/cursor.py
+++ b/src/connector/python/linux/python2/taos/cursor.py
@@ -26,7 +26,7 @@ class TDengineCursor(object):
     """
 
     def __init__(self, connection=None):
-        self._description = None
+        self._description = []
         self._rowcount = -1
         self._connection = None
         self._result = None
@@ -234,7 +234,7 @@ class TDengineCursor(object):
     def _reset_result(self):
         """Reset the result to unused version.
         """
-        self._description = None
+        self._description = []
         self._rowcount = -1
         if self._result is not None:
             CTaosInterface.freeResult(self._result)
diff --git a/src/connector/python/linux/python3/taos/cursor.py b/src/connector/python/linux/python3/taos/cursor.py
index d8184668c8..0ce20f0eda 100644
--- a/src/connector/python/linux/python3/taos/cursor.py
+++ b/src/connector/python/linux/python3/taos/cursor.py
@@ -27,7 +27,7 @@ class TDengineCursor(object):
     """
 
     def __init__(self, connection=None):
-        self._description = None
+        self._description = []
         self._rowcount = -1
         self._connection = None
         self._result = None
@@ -242,7 +242,7 @@ class TDengineCursor(object):
     def _reset_result(self):
         """Reset the result to unused version.
         """
-        self._description = None
+        self._description = []
         self._rowcount = -1
         if self._result is not None:
             CTaosInterface.freeResult(self._result)
diff --git a/src/connector/python/windows/python2/taos/cursor.py b/src/connector/python/windows/python2/taos/cursor.py
index 71651afee1..f6fde2619b 100644
--- a/src/connector/python/windows/python2/taos/cursor.py
+++ b/src/connector/python/windows/python2/taos/cursor.py
@@ -27,7 +27,7 @@ class TDengineCursor(object):
     """
 
     def __init__(self, connection=None):
-        self._description = None
+        self._description = []
         self._rowcount = -1
         self._connection = None
         self._result = None
@@ -193,7 +193,7 @@ class TDengineCursor(object):
     def _reset_result(self):
         """Reset the result to unused version.
         """
-        self._description = None
+        self._description = []
         self._rowcount = -1
         if self._result is not None:
             CTaosInterface.freeResult(self._result)
diff --git a/src/connector/python/windows/python3/taos/cursor.py b/src/connector/python/windows/python3/taos/cursor.py
index b813bba357..db66b99d3b 100644
--- a/src/connector/python/windows/python3/taos/cursor.py
+++ b/src/connector/python/windows/python3/taos/cursor.py
@@ -28,7 +28,7 @@ class TDengineCursor(object):
     """
 
     def __init__(self, connection=None):
-        self._description = None
+        self._description = []
         self._rowcount = -1
         self._connection = None
         self._result = None
@@ -194,7 +194,7 @@ class TDengineCursor(object):
     def _reset_result(self):
         """Reset the result to unused version.
         """
-        self._description = None
+        self._description = []
         self._rowcount = -1
         if self._result is not None:
             CTaosInterface.freeResult(self._result)

From e4dce56692fdec43a09267008eaeb4b7bbbb00c7 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Fri, 4 Dec 2020 11:30:21 +0800
Subject: [PATCH 3/3] [TD-785]Improve the robustness of python connector

---
 src/connector/python/linux/python2/setup.py           | 2 +-
 src/connector/python/linux/python2/taos/__init__.py   | 2 +-
 src/connector/python/linux/python3/setup.py           | 2 +-
 src/connector/python/linux/python3/taos/__init__.py   | 2 +-
 src/connector/python/windows/python2/setup.py         | 2 +-
 src/connector/python/windows/python2/taos/__init__.py | 2 +-
 src/connector/python/windows/python3/setup.py         | 2 +-
 src/connector/python/windows/python3/taos/__init__.py | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/connector/python/linux/python2/setup.py b/src/connector/python/linux/python2/setup.py
index b3daa98bdc..92a931b504 100644
--- a/src/connector/python/linux/python2/setup.py
+++ b/src/connector/python/linux/python2/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="2.0.2",
+    version="2.0.3",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",
diff --git a/src/connector/python/linux/python2/taos/__init__.py b/src/connector/python/linux/python2/taos/__init__.py
index 5d21671eed..62e0536b6f 100644
--- a/src/connector/python/linux/python2/taos/__init__.py
+++ b/src/connector/python/linux/python2/taos/__init__.py
@@ -3,7 +3,7 @@ from .connection import TDengineConnection
 from .cursor import TDengineCursor
 
 # Globals
-apilevel = '2.0.2'
+apilevel = '2.0.3'
 threadsafety = 0
 paramstyle = 'pyformat'
 
diff --git a/src/connector/python/linux/python3/setup.py b/src/connector/python/linux/python3/setup.py
index f49ebe2b6d..655a12ad13 100644
--- a/src/connector/python/linux/python3/setup.py
+++ b/src/connector/python/linux/python3/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="2.0.2",
+    version="2.0.3",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",
diff --git a/src/connector/python/linux/python3/taos/__init__.py b/src/connector/python/linux/python3/taos/__init__.py
index c46131eeaf..8cf095ea68 100644
--- a/src/connector/python/linux/python3/taos/__init__.py
+++ b/src/connector/python/linux/python3/taos/__init__.py
@@ -3,7 +3,7 @@ from .connection import TDengineConnection
 from .cursor import TDengineCursor
 
 # Globals
-apilevel = '2.0.2'
+apilevel = '2.0.3'
 threadsafety = 0
 paramstyle = 'pyformat'
 
diff --git a/src/connector/python/windows/python2/setup.py b/src/connector/python/windows/python2/setup.py
index 34cb7a04d7..5ddbe83011 100644
--- a/src/connector/python/windows/python2/setup.py
+++ b/src/connector/python/windows/python2/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="2.0.2",
+    version="2.0.3",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",
diff --git a/src/connector/python/windows/python2/taos/__init__.py b/src/connector/python/windows/python2/taos/__init__.py
index 5d21671eed..62e0536b6f 100644
--- a/src/connector/python/windows/python2/taos/__init__.py
+++ b/src/connector/python/windows/python2/taos/__init__.py
@@ -3,7 +3,7 @@ from .connection import TDengineConnection
 from .cursor import TDengineCursor
 
 # Globals
-apilevel = '2.0.2'
+apilevel = '2.0.3'
 threadsafety = 0
 paramstyle = 'pyformat'
 
diff --git a/src/connector/python/windows/python3/setup.py b/src/connector/python/windows/python3/setup.py
index c09644d330..ffed304c85 100644
--- a/src/connector/python/windows/python3/setup.py
+++ b/src/connector/python/windows/python3/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="2.0.2",
+    version="2.0.3",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",
diff --git a/src/connector/python/windows/python3/taos/__init__.py b/src/connector/python/windows/python3/taos/__init__.py
index 0708b9544f..c6dd929a6a 100644
--- a/src/connector/python/windows/python3/taos/__init__.py
+++ b/src/connector/python/windows/python3/taos/__init__.py
@@ -3,7 +3,7 @@ from .connection import TDengineConnection
 from .cursor import TDengineCursor
 
 # Globals
-apilevel = '2.0.2'
+apilevel = '2.0.3'
 threadsafety = 0
 paramstyle = 'pyformat'