Merge pull request #66 from datafuselabs/fix/empty-response-exception

fix: handle empty response content

Author: hantmac

databend_py/connection.py

@@ -135,17 +135,21 @@ def do_query(self, url, query_sql):
                                               auth=HTTPBasicAuth(self.user, self.password),
                                               timeout=(self.connect_timeout, self.read_timeout),
                                               verify=True)
-        try:
-            resp_dict = json.loads(response.content)
-        except json.decoder.JSONDecodeError:
-            raise UnexpectedException("failed to parse response: %s" % response.content)
-        if resp_dict and resp_dict.get('error') and "no endpoint" in resp_dict.get('error'):
-            raise WarehouseTimeoutException
-        if resp_dict and resp_dict.get('error'):
-            raise UnexpectedException("failed to query: %s" % response.content)
-        if self.persist_cookies:
-            self.cookies = response.cookies
-        return resp_dict
+
+        if response.content:
+            try:
+                resp_dict = json.loads(response.content)
+            except ValueError:
+                raise UnexpectedException("failed to parse response: %s" % response.content)
+            if resp_dict and resp_dict.get('error') and "no endpoint" in resp_dict.get('error'):
+                raise WarehouseTimeoutException
+            if resp_dict and resp_dict.get('error'):
+                raise UnexpectedException("failed to query: %s" % response.content)
+            if self.persist_cookies:
+                self.cookies = response.cookies
+            return resp_dict
+        else:
+            raise UnexpectedException("response content is empty: %s" % response)
 
     def query(self, statement):
         url = self.format_url()

databend_py/defines.py

@@ -2,8 +2,8 @@
 DEFAULT_USER = 'root'
 DEFAULT_PASSWORD = ''
 DEFAULT_SESSION_IDLE_TIME = 30
-DEFAULT_CONNECT_TIMEOUT = 20
-DEFAULT_READ_TIMEOUT = 20
+DEFAULT_CONNECT_TIMEOUT = 180
+DEFAULT_READ_TIMEOUT = 180
 
 DBMS_NAME = 'Databend'
 CLIENT_NAME = 'databend-py'

tests/test_client.py

@@ -46,8 +46,8 @@ def test_simple(self):
         self.assertEqual(c.connection.schema, "http")
         c = Client.from_url("databend://root:root@localhost:8000/default?compress=True")
         self.assertEqual(c._uploader._compress, True)
-        self.assertEqual(c.connection.connect_timeout, 20)
-        self.assertEqual(c.connection.read_timeout, 20)
+        self.assertEqual(c.connection.connect_timeout, 180)
+        self.assertEqual(c.connection.read_timeout, 180)
 
         c = Client.from_url("databend://root:root@localhost:8000/default?connect_timeout=30&read_timeout=30")
         self.assertEqual(c.connection.connect_timeout, 30)