Merge pull request #47 from bonitoo-io/fix/precision_param

fix: Fixing microsecond precision constant for v1 (#49)

Author: vlastahajek

CHANGELOG.md

@@ -1,7 +1,13 @@
 # Changelog
+## Version 3.x.x
+ - [FIX] Compilation error on fields order (#43)
+ - [FIX] Invalid precision constant for microseconds (#49)
+
+## Version 3.1.1
+- [Updated] CA Certificate for SSL (#38)
 
 ## Version 3.1.0
- - [NEW] user-agent header added
+ - [NEW] Added User-agent header
  - [FIX] status code check when pinging an InfluxDB version 1.x instance
 
 ## Version 3.0.0

src/InfluxDbClient.cpp

@@ -57,10 +57,10 @@ static String escapeKey(String key);
 static String escapeValue(const char *value);
 static String escapeJSONString(String &value);
 
-static String precisionToString(WritePrecision precision) {
+static String precisionToString(WritePrecision precision, uint8_t version = 2) {
     switch(precision) {
         case WritePrecision::US:
-            return "us";
+            return version==1?"u":"us";
         case WritePrecision::MS:
             return "ms";
         case WritePrecision::NS:
@@ -266,7 +266,7 @@ void InfluxDBClient::setUrls() {
         }
     }
     if(_writePrecision != WritePrecision::NoTime) {
-        _writeUrl += String("&precision=") + precisionToString(_writePrecision);
+        _writeUrl += String("&precision=") + precisionToString(_writePrecision, _dbVersion);
     }
 
 }

test/server/server.js

@@ -231,26 +231,36 @@ function handleAuthentication(req, res) {
     }
 }
 
+const AllowedPrecisions = ['ns','us','ms','s'];
 function checkWriteParams(req, res) {
     var org = req.query['org'];
     var bucket = req.query['bucket'];
+    var precision = req.query['precision'];
     if(org != 'my-org') {
         res.status(404).send(`{"code":"not found","message":"organization name \"${org}\" not found"}`);
         return false;
     } else if(bucket != 'my-bucket') {
         res.status(404).send(`{"code":"not found","message":"bucket \"${bucket}\" not found"}`);
         return false;
+    } else if(typeof precision !== 'undefined' && AllowedPrecisions.indexOf(precision)==-1) {
+        res.status(400).send(`{"code":"bad request ","message":"precision \"${precision}\" is not valid"}`);
+        return false;
     } else {
         return true;
     }
 }
 
+const AllowedPrecisionsV1 = ['ns','u','ms','s'];
 function checkWriteParamsV1(req, res) {
     var db = req.query['db'];
+    var precision = req.query['precision'];
     if(db != 'my-db') {
         res.status(404).send(`{"code":"not found","message":"database \"${db}\" not found"}`);
         return false;
-    } else {
+    } else if(typeof precision !== 'undefined' && AllowedPrecisionsV1.indexOf(precision)==-1) {
+        res.status(400).send(`{"code":"bad request ","message":"precision \"${precision}\" is not valid"}`);
+        return false;
+    }else {
         return true;
     }
 }

test/test.ino

@@ -176,6 +176,15 @@ void testBasicFunction() {
     String q = queryFlux(client.getServerUrl(),INFLUXDB_CLIENT_TESTING_TOK, INFLUXDB_CLIENT_TESTING_ORG, query);
     TEST_ASSERT(countLines(q) == 6);  //5 points+header
 
+    // test precision
+    for (int i = (int)WritePrecision::NoTime; i <= (int)WritePrecision::NS; i++) {
+        client.setWriteOptions((WritePrecision)i, 1);
+        Point *p = createPoint("test1");
+        p->addField("index", i);
+        TEST_ASSERTM(client.writePoint(*p), String("i=") + i);
+        delete p;
+    }
+
     TEST_END();
     deleteAll(INFLUXDB_CLIENT_TESTING_URL);
 }
@@ -768,6 +777,15 @@ void testV1() {
     q = queryFlux(client.getServerUrl(),INFLUXDB_CLIENT_TESTING_TOK, INFLUXDB_CLIENT_TESTING_ORG, query);
     lines = getLines(q, count);
     TEST_ASSERT(count == 16);  
+
+    // test precision
+    for (int i = (int)WritePrecision::NoTime; i <= (int)WritePrecision::NS; i++) {
+        client.setWriteOptions((WritePrecision)i, 1);
+        Point *p = createPoint("test1");
+        p->addField("index", i);
+        TEST_ASSERTM(client.writePoint(*p), String("i=") + i);
+        delete p;
+    }
     TEST_END();
     deleteAll(INFLUXDB_CLIENT_TESTING_URL);
 }