influxdb-client 1.2.0.pre.471 → 1.2.0.pre.503

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faad998c9be6723695c1cf6acb5c09015cd3eba3d3faafb81a8dc9ddf8d9d2a1
-  data.tar.gz: 60cc22e507e5cfdcfc91fdb627c4d6a461c6a312d28249824bdf17b80bf24b0a
+  metadata.gz: 369c8281b3985a0757703f1c68a95d25793508a8c1c3c6dd458646ae01c768d8
+  data.tar.gz: 82c4dae23afd29ccb574a6314443ef53fc4fe3ff17f9f952d435c7522441d7e3
 SHA512:
-  metadata.gz: 452b93ec31008b6b3973a548837bcee779506af4422428f8f8774b6b94332c7982773a99f6113be406b157699deced5a471ab305ade2aa1eb08503740e5f4265
-  data.tar.gz: d5af60e0fc29ea16e7d744f15b9c3ffca4e798cfac9a129f7f0500dbec8fb3ca48f2dc4c8af9df7650160ec047037efb06f160d9d3bc92d80a7ba1400557803b
+  metadata.gz: 17c810f5d87978b3c7359031b52fa86d39c06d70bb118a15e4f686f5f0b515de2001bc77cae24bce50a1dec6d4f3b366b104997e657d61219586e266c67b3d4b
+  data.tar.gz: 5255b4b24ffd03b9895c624a501e765881a944368cd31d41eb02c421b29344955ad941532df9d02b416acb0ab9a7ff389142c432fca974ecf301ef88ba3f7c88

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 1.2.0 [unreleased]
 
+### Bugs
+1. [#22](https://github.com/influxdata/influxdb-client-ruby/pull/22): Fixed batch write
+
 ## 1.1.0 [2020-02-14]
 
 ### Features

data/lib/influxdb2/client/flux_csv_parser.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 require 'csv'
 require 'base64'
+require 'time'
 
 module InfluxDB2
   # This class represents Flux query error

data/lib/influxdb2/client/worker.rb

@@ -50,7 +50,7 @@ module InfluxDB2
       @queue.push(payload)
     end
 
-    def check_background_queue(size: false, flush_all: false)
+    def check_background_queue(size: false)
       @queue_event.pop
       data = {}
       points = 0
@@ -60,7 +60,7 @@ module InfluxDB2
         return
       end
 
-      while (flush_all || points < @write_options.batch_size) && !@queue.empty?
+      while (points < @write_options.batch_size) && !@queue.empty?
         begin
           item = @queue.pop(true)
           key = item.key
@@ -68,16 +68,20 @@ module InfluxDB2
           data[key] << item.data
           points += 1
         rescue ThreadError
+          @queue_event.push(true)
           return
         end
       end
 
-      write(data) unless data.values.flatten.empty?
-      @queue_event.push(true)
+      begin
+        write(data) unless data.values.flatten.empty?
+      ensure
+        @queue_event.push(true)
+      end
     end
 
     def flush_all
-      check_background_queue(flush_all: true) unless @queue.empty?
+      check_background_queue until @queue.empty?
     end
 
     def write(data)

data/test/influxdb/write_api_batching_test.rb

@@ -136,6 +136,19 @@ class WriteApiBatchingTest < MiniTest::Test
     stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
       .to_return(status: 204)
 
+    @client.close!
+
+    @write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
+                                                 batch_size: 10, flush_interval: 5_000)
+    @client = InfluxDB2::Client.new('http://localhost:9999',
+                                    'my-token',
+                                    bucket: 'my-bucket',
+                                    org: 'my-org',
+                                    precision: InfluxDB2::WritePrecision::NANOSECOND,
+                                    use_ssl: false)
+
+    @write_client = @client.create_write_api(write_options: @write_options)
+
     @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=1.0 1')
     @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=2.0 2')
     @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=3.0 3')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.471
+  version: 1.2.0.pre.503
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler