Merge pull request #156 from tobiasschuerg/fix/buff_size_rounding

fix: Correctly rounding writeBufferSize, when bufferSize/batchSize >=…

Author: vlastahajek

CHANGELOG.md

@@ -1,7 +1,8 @@
 # Changelog
-## 3.8.1 [in progress]
+## [in progress]
 ### Fixes
  - [#150](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino/pull/150) - `HTTPOptions::httpReadTimeout` is also set as the connect timeout for HTTP connection on ESP32. It doesn't work for HTTPS connection yet. 
+ - [#156](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino/pull/156) - Correctly rounding _writeBufferSize_, when _bufferSize/batchSize >= 256_. 
 
 ## 3.8.0 [2021-04-01]
 ### Features

src/InfluxDbClient.cpp

@@ -294,15 +294,20 @@ void InfluxDBClient::setWriteOptions(const WriteOptions & writeOptions) {
         _writeOptions._writePrecision = writeOptions._writePrecision;
         setUrls();
     }
-    if(writeOptions._batchSize > 0) {
+    bool writeBufferSizeChanges = false;
+    if(writeOptions._batchSize > 0 && _writeOptions._batchSize != writeOptions._batchSize) {
         _writeOptions._batchSize = writeOptions._batchSize;
+        writeBufferSizeChanges = true;
     }
-    if(_writeOptions._bufferSize > 0 && writeOptions._bufferSize > 0 && _writeOptions._bufferSize != writeOptions._bufferSize) {
+    if(writeOptions._bufferSize > 0 && _writeOptions._bufferSize != writeOptions._bufferSize) {
         _writeOptions._bufferSize = writeOptions._bufferSize;
         if(_writeOptions._bufferSize <  2*_writeOptions._batchSize) {
             _writeOptions._bufferSize = 2*_writeOptions._batchSize;
             INFLUXDB_CLIENT_DEBUG("[D] Changing buffer size to %d\n", _writeOptions._bufferSize);
         }
+        writeBufferSizeChanges = true;
+    }
+    if(writeBufferSizeChanges) {
         resetBuffer();
     }
     _writeOptions._flushInterval = writeOptions._flushInterval;
@@ -331,7 +336,10 @@ void InfluxDBClient::resetBuffer() {
         }
         delete [] _writeBuffer;
     }
-    _writeBufferSize = _writeOptions._bufferSize/_writeOptions._batchSize;
+    INFLUXDB_CLIENT_DEBUG("[D] Reset buffer: buffer Size: %d, batch size: %d\n", _writeOptions._bufferSize, _writeOptions._batchSize);
+    uint16_t a = _writeOptions._bufferSize/_writeOptions._batchSize;
+    //limit to max(byte)
+    _writeBufferSize = a>=(1<<8)?(1<<8)-1:a;
     if(_writeBufferSize < 2) {
         _writeBufferSize = 2;
     }

test/Test.cpp

@@ -168,6 +168,14 @@ void Test::testOptions() {
     TEST_ASSERT(!c._httpOptions._connectionReuse);
     TEST_ASSERT(c._httpOptions._httpReadTimeout == 20000);
 
+    defWO = WriteOptions().batchSize(100).bufferSize(7000);
+    c.setWriteOptions(defWO);
+    TEST_ASSERTM(c._writeBufferSize == 70, String(c._writeBufferSize));
+
+    defWO = WriteOptions().batchSize(10).bufferSize(7000);
+    c.setWriteOptions(defWO);
+    TEST_ASSERTM(c._writeBufferSize == 255, String(c._writeBufferSize));
+
     TEST_END();
 }
 
@@ -531,7 +539,8 @@ void Test::testUserAgent() {
     TEST_ASSERT(client.validateConnection());
     String url = String(Test::apiUrl) + "/test/user-agent";
     HTTPClient http;
-    TEST_ASSERT(http.begin(url));
+    WiFiClient wifiClient;
+    TEST_ASSERT(http.begin(wifiClient, url));
     TEST_ASSERT(http.GET() == 200);
     String agent = "influxdb-client-arduino/" INFLUXDB_CLIENT_VERSION " (" INFLUXDB_CLIENT_PLATFORM " " INFLUXDB_CLIENT_PLATFORM_VERSION ")";
     String data = http.getString();

test/TestSupport.cpp

@@ -44,7 +44,8 @@ void printFreeHeap() {
 int httpPOST(String url, String mess) {
   httpClient.setReuse(false);
   int code = 0;
-  if(httpClient.begin(url)) {
+  WiFiClient client;
+  if(httpClient.begin(client, url)) {
     code = httpClient.POST(mess);
     httpClient.end();
   }
@@ -54,7 +55,8 @@ int httpPOST(String url, String mess) {
 int httpGET(String url) {
   httpClient.setReuse(false);
   int code = 0;
-  if(httpClient.begin(url)) {
+  WiFiClient client;
+  if(httpClient.begin(client, url)) {
     code = httpClient.GET();
     if(code != 204) {
        //Serial.print("[TD] ");