influxdb-client 1.5.0.pre.858 → 1.6.0.pre.963

data/lib/influxdb2/client/models/health_check.rb

@@ -22,6 +22,10 @@ module InfluxDB2
 
     attr_accessor :status
 
+    attr_accessor :version
+
+    attr_accessor :commit
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -50,7 +54,9 @@ module InfluxDB2
         :'name' => :'name',
         :'message' => :'message',
         :'checks' => :'checks',
-        :'status' => :'status'
+        :'status' => :'status',
+        :'version' => :'version',
+        :'commit' => :'commit'
       }
     end
 
@@ -60,7 +66,9 @@ module InfluxDB2
         :'name' => :'String',
         :'message' => :'String',
         :'checks' => :'Array<HealthCheck>',
-        :'status' => :'String'
+        :'status' => :'String',
+        :'version' => :'String',
+        :'commit' => :'String'
       }
     end
 
@@ -89,6 +97,14 @@ module InfluxDB2
       if attributes.has_key?(:'status')
         self.status = attributes[:'status']
       end
+
+      if attributes.has_key?(:'version')
+        self.version = attributes[:'version']
+      end
+
+      if attributes.has_key?(:'commit')
+        self.commit = attributes[:'commit']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -134,7 +150,9 @@ module InfluxDB2
           name == o.name &&
           message == o.message &&
           checks == o.checks &&
-          status == o.status
+          status == o.status &&
+          version == o.version &&
+          commit == o.commit
     end
 
     # @see the `==` method
@@ -146,7 +164,7 @@ module InfluxDB2
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [name, message, checks, status].hash
+      [name, message, checks, status, version, commit].hash
     end
 
     # Builds the object from hash

data/lib/influxdb2/client/models/query.rb

@@ -13,27 +13,21 @@ OpenAPI Generator version: 3.3.4
 require 'date'
 
 module InfluxDB2
-  # Query influx with specific return formatting.
+  # Query influx using the Flux language
   class Query
     attr_accessor :extern
 
     # Query script to execute.
     attr_accessor :query
 
-    # The type of query.
+    # The type of query. Must be \"flux\".
     attr_accessor :type
 
-    # Required for `influxql` type queries.
-    attr_accessor :db
-
-    # Required for `influxql` type queries.
-    attr_accessor :rp
-
-    # Required for `influxql` type queries.
-    attr_accessor :cluster
-
     attr_accessor :dialect
 
+    # Specifies the time that should be reported as \"now\" in the query. Default is the server's now time.
+    attr_accessor :now
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -62,10 +56,8 @@ module InfluxDB2
         :'extern' => :'extern',
         :'query' => :'query',
         :'type' => :'type',
-        :'db' => :'db',
-        :'rp' => :'rp',
-        :'cluster' => :'cluster',
-        :'dialect' => :'dialect'
+        :'dialect' => :'dialect',
+        :'now' => :'now'
       }
     end
 
@@ -75,10 +67,8 @@ module InfluxDB2
         :'extern' => :'File',
         :'query' => :'String',
         :'type' => :'String',
-        :'db' => :'String',
-        :'rp' => :'String',
-        :'cluster' => :'String',
-        :'dialect' => :'Dialect'
+        :'dialect' => :'Dialect',
+        :'now' => :'DateTime'
       }
     end
 
@@ -100,25 +90,15 @@ module InfluxDB2
 
       if attributes.has_key?(:'type')
         self.type = attributes[:'type']
-      else
-        self.type = 'flux'
-      end
-
-      if attributes.has_key?(:'db')
-        self.db = attributes[:'db']
-      end
-
-      if attributes.has_key?(:'rp')
-        self.rp = attributes[:'rp']
-      end
-
-      if attributes.has_key?(:'cluster')
-        self.cluster = attributes[:'cluster']
       end
 
       if attributes.has_key?(:'dialect')
         self.dialect = attributes[:'dialect']
       end
+
+      if attributes.has_key?(:'now')
+        self.now = attributes[:'now']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -136,7 +116,7 @@ module InfluxDB2
     # @return true if the model is valid
     def valid?
       return false if @query.nil?
-      type_validator = EnumAttributeValidator.new('String', ['flux', 'influxql'])
+      type_validator = EnumAttributeValidator.new('String', ['flux'])
       return false unless type_validator.valid?(@type)
       true
     end
@@ -144,7 +124,7 @@ module InfluxDB2
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] type Object to be assigned
     def type=(type)
-      validator = EnumAttributeValidator.new('String', ['flux', 'influxql'])
+      validator = EnumAttributeValidator.new('String', ['flux'])
       unless validator.valid?(type)
         fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
       end
@@ -159,10 +139,8 @@ module InfluxDB2
           extern == o.extern &&
           query == o.query &&
           type == o.type &&
-          db == o.db &&
-          rp == o.rp &&
-          cluster == o.cluster &&
-          dialect == o.dialect
+          dialect == o.dialect &&
+          now == o.now
     end
 
     # @see the `==` method
@@ -174,7 +152,7 @@ module InfluxDB2
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [extern, query, type, db, rp, cluster, dialect].hash
+      [extern, query, type, dialect, now].hash
     end
 
     # Builds the object from hash

data/lib/influxdb2/client/point.rb

@@ -21,6 +21,8 @@
 module InfluxDB2
   DEFAULT_WRITE_PRECISION = WritePrecision::NANOSECOND
   ESCAPE_KEY_LIST = ['\\'.freeze, ','.freeze, ' '.freeze, '='.freeze].freeze
+  ESCAPE_MEASUREMENT_LIST = ['\\'.freeze, ','.freeze, ' '.freeze].freeze
+  REPLACE_KEY_LIST = { "\n".freeze => '\n'.freeze, "\r".freeze => '\r'.freeze, "\t".freeze => '\t'.freeze }.freeze
   ESCAPE_VALUE_LIST = ['\\'.freeze, '"'.freeze].freeze
 
   # Point defines the values that will be written to the database.
@@ -113,7 +115,7 @@ module InfluxDB2
     # @return a string representation of the point
     def to_line_protocol
       line_protocol = ''
-      measurement = _escape_key(@name || '')
+      measurement = _escape_key(@name || '', ESCAPE_MEASUREMENT_LIST)
 
       line_protocol << measurement
 
@@ -161,11 +163,14 @@ module InfluxDB2
       end.reject(&:nil?).join(','.freeze)
     end
 
-    def _escape_key(value)
+    def _escape_key(value, escape_list = ESCAPE_KEY_LIST)
       result = value.dup
-      ESCAPE_KEY_LIST.each do |ch|
+      escape_list.each do |ch|
         result = result.gsub(ch) { "\\#{ch}" }
       end
+      REPLACE_KEY_LIST.keys.each do |ch|
+        result = result.gsub(ch) { REPLACE_KEY_LIST[ch] }
+      end
       result
     end
 

data/lib/influxdb2/client/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module InfluxDB2
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/lib/influxdb2/client/worker.rb

@@ -99,7 +99,7 @@ module InfluxDB2
     end
 
     def _write_raw(key, points)
-      if @write_options.jitter_interval.positive?
+      if @write_options.jitter_interval > 0
         jitter_delay = (@write_options.jitter_interval.to_f / 1_000) * rand
         sleep jitter_delay
       end

data/test/influxdb/point_test.rb

@@ -218,4 +218,25 @@ class PointTest < MiniTest::Test
 
     assert_equal 'h2o level=2i 123', point.to_line_protocol
   end
+
+  def test_tag_escaping
+    point = InfluxDB2::Point.new(name: "h\n2\ro\t_data")
+                            .add_tag("new\nline", "new\nline")
+                            .add_tag("carriage\rreturn", "carriage\nreturn")
+                            .add_tag("t\tab", "t\tab")
+                            .add_field('level', 2)
+
+    puts point.to_line_protocol
+
+    assert_equal 'h\\n2\\ro\\t_data,carriage\\rreturn=carriage\\nreturn,new\\nline=new\\nline,t\\tab=t\\tab level=2i',
+                 point.to_line_protocol
+  end
+
+  def test_equal_sign_escaping
+    point = InfluxDB2::Point.new(name: 'h=2o')
+                            .add_tag('l=ocation', 'e=urope')
+                            .add_field('l=evel', 2)
+
+    assert_equal 'h=2o,l\\=ocation=e\\=urope l\\=evel=2i', point.to_line_protocol
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.858
+  version: 1.6.0.pre.963
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler