Merge pull request #51 from bonitoo-io/fix/write_no_tag_#50

fix: fixing line protocol composition when point has no tags (#50)

Author: tobiasschuerg

CHANGELOG.md

@@ -2,6 +2,7 @@
 ## Version 3.x.x
  - [FIX] Compilation error on fields order (#43)
  - [FIX] Invalid precision constant for microseconds (#49)
+ - [FIX] Write error in case point has no tags (#50)
 
 ## Version 3.1.1
 - [Updated] CA Certificate for SSL (#38)

src/InfluxDbClient.cpp

@@ -104,8 +104,14 @@ void Point::putField(String name, String value) {
 }
 
 String Point::toLineProtocol() const {
-    String line =  _measurement + "," + _tags + " " + _fields;
-    if(_timestamp != "") {
+    String line =  _measurement;
+    if(hasTags()) {
+        line += "," + _tags;
+    }
+    if(hasFields()) {
+        line += " " + _fields;
+    }
+    if(hasTime()) {
         line += " " + _timestamp;
     }
     return line;

src/InfluxDbClient.h

@@ -70,7 +70,7 @@ class Point {
     // Add field with various types
     void addField(String name, float value, int decimalPlaces = 2)         { if(!isnan(value)) putField(name, String(value, decimalPlaces)); }
     void addField(String name, double value)        { if(!isnan(value)) putField(name, String(value)); }
-    void addField(String name, char value)          { putField(name, String(value)); }
+    void addField(String name, char value)          { addField(name, String(value).c_str()); }
     void addField(String name, unsigned char value) { putField(name, String(value)+"i"); }
     void addField(String name, int value)           { putField(name, String(value)+"i"); }
     void addField(String name, unsigned int value)  { putField(name, String(value)+"i"); }

test/test.ino

@@ -76,13 +76,30 @@ void testPoint() {
     p.addTag("tag1", "tagvalue");
     TEST_ASSERT(p.hasTags());
     TEST_ASSERT(!p.hasFields());
-    p.addField("field1", 23);
+    p.addField("fieldInt", -23);
     TEST_ASSERT(p.hasFields());
-    p.addField("field2", true);
-    p.addField("field3", 1.123);
-    p.addField("field4", "texttest");
+    p.addField("fieldBool", true);
+    p.addField("fieldFloat1", 1.123f);
+    p.addField("fieldFloat2", 1.12345f, 5);
+    p.addField("fieldDouble1", 1.123);
+    p.addField("fieldDouble2", 1.12345, 5);
+    p.addField("fieldChar", 'A');
+    p.addField("fieldUChar", (unsigned char)1);
+    p.addField("fieldUInt", 23u);
+    p.addField("fieldLong", 123456l);
+    p.addField("fieldULong", 123456ul);
+    p.addField("fieldString", "text test");
     String line = p.toLineProtocol();
-    String testLine = "test,tag1=tagvalue field1=23i,field2=true,field3=1.12,field4=\"texttest\"";
+    String testLine = "test,tag1=tagvalue fieldInt=-23i,fieldBool=true,fieldFloat1=1.12,fieldFloat2=1.12345,fieldDouble1=1.12,fieldDouble2=1.12345,fieldChar=\"A\",fieldUChar=1i,fieldUInt=23i,fieldLong=123456i,fieldULong=123456i,fieldString=\"text test\"";
+    TEST_ASSERTM(line == testLine, line);
+
+    p.clearFields();
+    p.clearTags();
+
+    //line protocol without tags
+    p.addField("f", 1);
+    line = p.toLineProtocol();
+    testLine = "test f=1i";
     TEST_ASSERTM(line == testLine, line);
 
     TEST_ASSERT(!p.hasTime());