Removed support for querying

Author: vlastahajek

examples/Query/Query.ino

@@ -242,14 +242,11 @@ void InfluxDBClient::clean() {
 void InfluxDBClient::setUrls() {
     if(_dbVersion == 2) {
         _writeUrl = _serverUrl + "/api/v2/write?org=" + _org + "&bucket=" + _bucket;
-        _queryUrl = _serverUrl + "/api/v2/query?org=" + _org;
     } else {
         _writeUrl = _serverUrl + "/write?db=" + _bucket;
-        _queryUrl = _serverUrl + "/api/v2/query?db=" + _bucket;
         if(_user.length() > 0 && _password.length() > 0) {
             String auth =  "&u=" + _user + "&p=" + _password;
             _writeUrl += auth;
-            _queryUrl += auth;
         }
     }
     if(_writePrecision != WritePrecision::NoTime) {
@@ -512,42 +509,6 @@ int InfluxDBClient::postData(const char *data) {
     return _lastStatusCode;
 }
 
-String InfluxDBClient::query(String &fluxQuery) {
-    if(_lastRetryAfter > 0 && (millis()-_lastRequestTime)/1000 < _lastRetryAfter) {
-        // retry after period didn't run out yet
-        return "";
-    }
-    if(!_wifiClient && !init()) {
-        _lastStatusCode = 0;
-        _lastErrorResponse = FPSTR(UnitialisedMessage);
-        return "";
-    }
-    INFLUXDB_CLIENT_DEBUG("[D] Query to %s\n", _queryUrl.c_str());
-    if(!_httpClient.begin(*_wifiClient, _queryUrl)) {
-        INFLUXDB_CLIENT_DEBUG("[E] begin failed\n");
-        return "";
-    }
-    _httpClient.addHeader(F("Content-Type"), F("application/vnd.flux"));
-    
-    INFLUXDB_CLIENT_DEBUG("[D] JSON query:\n%s\n", fluxQuery.c_str());
-    
-    preRequest();
-
-    _lastStatusCode = _httpClient.POST(fluxQuery);
-    
-    postRequest(200);
-    String queryResult;
-    if(_lastStatusCode == 200) {
-        queryResult = _httpClient.getString();
-        queryResult.trim();
-        INFLUXDB_CLIENT_DEBUG("[D] Response:\n%s\n", queryResult.c_str());
-    }
-
-    _httpClient.end();
-
-    return queryResult;
-}
-
 void InfluxDBClient::postRequest(int expectedStatusCode) {
     _lastRequestTime = millis();
      INFLUXDB_CLIENT_DEBUG("[D] HTTP status code - %d\n", _lastStatusCode);

src/InfluxDbClient.cpp

@@ -164,9 +164,6 @@ class InfluxDBClient {
     // Writes record represented by Point to buffer
     // Returns true if successful, false in case of any error 
     bool writePoint(Point& point);
-    // Sends Flux query and returns raw JSON formatted response
-    // Return raw query response in the form of CSV table. Empty string can mean that query hasn't found anything or an error. Check getLastStatusCode() for 200 
-    String query(String &fluxQuery);
     // Writes all points in buffer, with respect to the batch size, and in case of success clears the buffer.
     // Returns true if successful, false in case of any error 
     bool flushBuffer();
@@ -185,8 +182,6 @@ class InfluxDBClient {
     String getLastErrorMessage() const { return _lastErrorResponse; }
     // Returns server url
     String getServerUrl() const { return _serverUrl; }
-    // Returns true if last query request has succeeded. Handy for distingushing empty result and error
-    bool wasLastQuerySuccessful() { return _lastStatusCode == 200; }
   protected:
     // Checks params and sets up security, if needed.
     // Returns true in case of success, otherwise false
@@ -209,8 +204,6 @@ class InfluxDBClient {
     String _password;
     // Cached full write url
     String _writeUrl;
-    // Cached full query url
-    String _queryUrl;
     // Points timestamp precision. 
     WritePrecision _writePrecision = WritePrecision::NoTime;
     // Number of points that will be written to the databases at once.