Line protocol: handle integer values (Closes: #225)

aviau · aviau · commit 308a9135190b · 2015-08-06T10:56:02.000-04:00
diff --git a/influxdb/line_protocol.py b/influxdb/line_protocol.py
@@ -12,7 +12,7 @@
 def _convert_timestamp(timestamp, precision=None):
     if isinstance(timestamp, int):
         return timestamp  # assume precision is correct if timestamp is int
-    if isinstance(_force_text(timestamp), text_type):
+    if isinstance(_get_unicode(timestamp), text_type):
         timestamp = parse(timestamp)
     if isinstance(timestamp, datetime):
         ns = (
@@ -32,6 +32,7 @@ def _convert_timestamp(timestamp, precision=None):
 
 
 def _escape_tag(tag):
+    tag = _get_unicode(tag, force=True)
     return tag.replace(
         "\\", "\\\\"
     ).replace(
@@ -44,21 +45,23 @@ def _escape_tag(tag):
 
 
 def _escape_value(value):
-    value = _force_text(value)
-    if isinstance(value, text_type):
+    value = _get_unicode(value)
+    if isinstance(value, text_type) and value != '':
         return "\"{}\"".format(value.replace(
             "\"", "\\\""
         ))
     else:
         return str(value)
 
 
-def _force_text(data):
+def _get_unicode(data, force=False):
     """
     Try to return a text aka unicode object from the given data.
     """
     if isinstance(data, binary_type):
         return data.decode('utf-8')
+    elif force:
+        return str(data)
     else:
         return data
 
@@ -74,7 +77,7 @@ def make_lines(data, precision=None):
         elements = []
 
         # add measurement name
-        measurement = _escape_tag(_force_text(
+        measurement = _escape_tag(_get_unicode(
             point.get('measurement', data.get('measurement'))
         ))
         key_values = [measurement]
@@ -90,6 +93,7 @@ def make_lines(data, precision=None):
         for tag_key in sorted(tags.keys()):
             key = _escape_tag(tag_key)
             value = _escape_tag(tags[tag_key])
+
             if key != '' and value != '':
                 key_values.append("{key}={value}".format(key=key, value=value))
         key_values = ','.join(key_values)
@@ -107,7 +111,7 @@ def make_lines(data, precision=None):
 
         # add timestamp
         if 'time' in point:
-            timestamp = _force_text(str(int(
+            timestamp = _get_unicode(str(int(
                 _convert_timestamp(point['time'], precision)
             )))
             elements.append(timestamp)
diff --git a/influxdb/tests/test_line_protocol.py b/influxdb/tests/test_line_protocol.py
@@ -6,22 +6,25 @@
 
 class TestLineProtocol(unittest.TestCase):
 
-    def test_empty_tag(self):
+    def test_make_lines(self):
         data = {
             "tags": {
-                "my_tag": ""
+                "empty_tag": "",
+                "integer_tag": 2,
+                "string_tag": "hello"
             },
             "points": [
                 {
                     "measurement": "test",
                     "fields": {
-                        "value": "hello!"
+                        "string_val": "hello!",
+                        "int_val": 1,
                     }
                 }
             ]
         }
 
         self.assertEqual(
             line_protocol.make_lines(data),
-            'test value="hello!"\n'
+            'test,integer_tag=2,string_tag=hello int_val=1,string_val="hello!"\n'
         )

Original file line number	Diff line number	Diff line change
`@@ -6,22 +6,25 @@`
`6`	`6`
`7`	`7`	`class TestLineProtocol(unittest.TestCase):`
`8`	`8`
`9`		`- def test_empty_tag(self):`
	`9`	`+ def test_make_lines(self):`
`10`	`10`	`data = {`
`11`	`11`	`"tags": {`
`12`		`- "my_tag": ""`
	`12`	`+ "empty_tag": "",`
	`13`	`+ "integer_tag": 2,`
	`14`	`+ "string_tag": "hello"`
`13`	`15`	`},`
`14`	`16`	`"points": [`
`15`	`17`	`{`
`16`	`18`	`"measurement": "test",`
`17`	`19`	`"fields": {`
`18`		`- "value": "hello!"`
	`20`	`+ "string_val": "hello!",`
	`21`	`+ "int_val": 1,`
`19`	`22`	`}`
`20`	`23`	`}`
`21`	`24`	`]`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`self.assertEqual(`
`25`	`28`	`line_protocol.make_lines(data),`
`26`		`- 'test value="hello!"\n'`
	`29`	`+ 'test,integer_tag=2,string_tag=hello int_val=1,string_val="hello!"\n'`
`27`	`30`	`)`