Merge branch 'master' of github.com:influxdb/influxdb-python into HEAD

aviau · aviau · commit d63369227ffd · 2015-04-26T21:41:01.000-04:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -2,7 +2,7 @@
 """
 Python client for InfluxDB
 """
-from collections import OrderedDict
+
 from functools import wraps
 import json
 import socket
@@ -180,27 +180,6 @@ def from_DSN(dsn, **kwargs):
 
         return InfluxDBClient(**init_args)
 
-    #
-    # By default we keep the "order" of the json responses:
-    # more clearly: any dict contained in the json response will have
-    # its key-value items order kept as in the raw answer, thanks to
-    # `collections.OrderedDict`.
-    # if one doesn't care in that, then it can simply change its client
-    # instance 'keep_json_response_order' attribute value (to a falsy one).
-    # This will then eventually help for performance considerations.
-    _keep_json_response_order = False
-    # NB: For "group by" query type :
-    # This setting is actually necessary in order to have a consistent and
-    # reproducible rsp format if you "group by" on more than 1 tag.
-
-    @property
-    def keep_json_response_order(self):
-        return self._keep_json_response_order
-
-    @keep_json_response_order.setter
-    def keep_json_response_order(self, new_value):
-        self._keep_json_response_order = new_value
-
     def switch_database(self, database):
         """
         switch_database()
@@ -309,10 +288,7 @@ def query(self,
             expected_response_code=expected_response_code
         )
 
-        json_kw = {}
-        if self.keep_json_response_order:
-            json_kw.update(object_pairs_hook=OrderedDict)
-        data = response.json(**json_kw)
+        data = response.json()
 
         return ResultSet(data)
 
diff --git a/influxdb/influxdb08/client.py b/influxdb/influxdb08/client.py
@@ -291,11 +291,11 @@ def list_chunks(l, n):
                 yield l[i:i + n]
 
         batch_size = kwargs.get('batch_size')
-        if batch_size:
+        if batch_size and batch_size > 0:
             for item in data:
                 name = item.get('name')
                 columns = item.get('columns')
-                point_list = item.get('points')
+                point_list = item.get('points', [])
 
                 for batch in list_chunks(point_list, batch_size):
                     item = [{
@@ -306,10 +306,10 @@ def list_chunks(l, n):
                     self._write_points(
                         data=item,
                         time_precision=time_precision)
-
-                return True
-
-        return self._write_points(data=data, time_precision=time_precision)
+            return True
+        else:
+            return self._write_points(data=data,
+                                      time_precision=time_precision)
 
     def write_points_with_precision(self, data, time_precision='s'):
         """
@@ -448,7 +448,13 @@ def _query(self, query, time_precision='s', chunked=False):
         )
 
         if chunked:
-            return list(chunked_json.loads(response.content.decode()))
+            decoded = {}
+            try:
+                decoded = chunked_json.loads(response.content.decode())
+            except UnicodeDecodeError:
+                decoded = chunked_json.loads(response.content.decode('utf-8'))
+            finally:
+                return list(decoded)
         else:
             return response.json()
 
diff --git a/tests/influxdb/influxdb08/client_test.py b/tests/influxdb/influxdb08/client_test.py
@@ -17,6 +17,16 @@
 from influxdb.influxdb08 import InfluxDBClient
 from influxdb.influxdb08.client import session
 
+import sys
+if sys.version < '3':
+    import codecs
+
+    def u(x):
+        return codecs.unicode_escape_decode(x)[0]
+else:
+    def u(x):
+        return x
+
 
 def _build_response_object(status_code=200, content=""):
     resp = requests.Response()
@@ -186,12 +196,46 @@ def test_write_points_string(self):
             )
 
     def test_write_points_batch(self):
-        with _mocked_session('post', 200, self.dummy_points):
-            cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
-            assert cli.write_points(
-                data=self.dummy_points,
-                batch_size=2
-            ) is True
+        with requests_mock.Mocker() as m:
+            m.register_uri(requests_mock.POST,
+                           "http://localhost:8086/db/db/series")
+            cli = InfluxDBClient('localhost', 8086,
+                                 'username', 'password', 'db')
+            cli.write_points(data=self.dummy_points, batch_size=2)
+        self.assertEqual(1, m.call_count)
+
+    def test_write_points_batch_invalid_size(self):
+        with requests_mock.Mocker() as m:
+            m.register_uri(requests_mock.POST,
+                           "http://localhost:8086/db/db/series")
+            cli = InfluxDBClient('localhost', 8086,
+                                 'username', 'password', 'db')
+            cli.write_points(data=self.dummy_points, batch_size=-2)
+        self.assertEqual(1, m.call_count)
+
+    def test_write_points_batch_multiple_series(self):
+        dummy_points = [
+            {"points": [["1", 1, 1.0], ["2", 2, 2.0], ["3", 3, 3.0],
+                        ["4", 4, 4.0], ["5", 5, 5.0]],
+             "name": "foo",
+             "columns": ["val1", "val2", "val3"]},
+            {"points": [["1", 1, 1.0], ["2", 2, 2.0], ["3", 3, 3.0],
+                        ["4", 4, 4.0], ["5", 5, 5.0], ["6", 6, 6.0],
+                        ["7", 7, 7.0], ["8", 8, 8.0]],
+             "name": "bar",
+             "columns": ["val1", "val2", "val3"]},
+        ]
+        expected_last_body = [{'points': [['7', 7, 7.0], ['8', 8, 8.0]],
+                               'name': 'bar',
+                               'columns': ['val1', 'val2', 'val3']}]
+        with requests_mock.Mocker() as m:
+            m.register_uri(requests_mock.POST,
+                           "http://localhost:8086/db/db/series")
+            cli = InfluxDBClient('localhost', 8086,
+                                 'username', 'password', 'db')
+            cli.write_points(data=dummy_points, batch_size=3)
+        self.assertEqual(m.call_count, 5)
+        self.assertEqual(expected_last_body, m.request_history[4].json())
 
     def test_write_points_udp(self):
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -332,6 +376,35 @@ def test_query_chunked(self):
                 [example_object, example_object]
             )
 
+    def test_query_chunked_unicode(self):
+        cli = InfluxDBClient(database='db')
+        example_object = {
+            'points': [
+                [1415206212980, 10001, u('unicode-\xcf\x89')],
+                [1415197271586, 10001, u('more-unicode-\xcf\x90')]
+            ],
+            'name': 'foo',
+            'columns': [
+                'time',
+                'sequence_number',
+                'val'
+            ]
+        }
+        example_response = \
+            json.dumps(example_object) + json.dumps(example_object)
+
+        with requests_mock.Mocker() as m:
+            m.register_uri(
+                requests_mock.GET,
+                "http://localhost:8086/db/db/series",
+                text=example_response
+            )
+
+            self.assertListEqual(
+                cli.query('select * from foo', chunked=True),
+                [example_object, example_object]
+            )
+
     @raises(Exception)
     def test_query_fail(self):
         with _mocked_session('get', 401):
