influxdb-client 1.0.0.pre.191 → 1.1.0.pre.459

data/test/influxdb/query_api_integration_test.rb

@@ -0,0 +1,58 @@
+# The MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'test_helper'
+
+class QueryApiIntegrationTest < MiniTest::Test
+  def setup
+    WebMock.allow_net_connect!
+
+    @client = InfluxDB2::Client.new('http://localhost:9999', 'my-token',
+                                    bucket: 'my-bucket',
+                                    org: 'my-org',
+                                    precision: InfluxDB2::WritePrecision::NANOSECOND,
+                                    use_ssl: false)
+  end
+
+  def test_query
+    now = Time.now.utc
+    measurement = 'h2o_query_' + now.to_i.to_s
+
+    @client.create_write_api.write(data: InfluxDB2::Point.new(name: measurement)
+                                                         .add_tag('location', 'europe')
+                                                         .add_field('level', 2)
+                                                         .time(now, InfluxDB2::WritePrecision::NANOSECOND))
+
+    result = @client.create_query_api.query(query: 'from(bucket: "my-bucket") |> range(start: -1m, stop: now()) '\
+          "|> filter(fn: (r) => r._measurement == \"#{measurement}\")")
+
+    assert_equal 1, result.size
+
+    records = result[0].records
+    assert_equal 1, records.size
+
+    record = records[0]
+
+    assert_equal measurement, record.measurement
+    assert_equal 'europe', record.values['location']
+    assert_equal 2, record.value
+    assert_equal 'level', record.field
+  end
+end

data/test/influxdb/query_api_stream_test.rb

@@ -0,0 +1,98 @@
+# The MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'test_helper'
+
+class QueryApiStreamTest < MiniTest::Test
+  def setup
+    WebMock.allow_net_connect!
+
+    @client = InfluxDB2::Client.new('http://localhost:9999', 'my-token',
+                                    bucket: 'my-bucket',
+                                    org: 'my-org',
+                                    precision: InfluxDB2::WritePrecision::NANOSECOND,
+                                    use_ssl: false)
+    @now = Time.now.utc
+  end
+
+  def test_query_stream
+    measurement = 'h2o_query_stream' + @now.to_i.to_s + @now.nsec.to_s
+    _write(10, measurement: measurement)
+
+    query = 'from(bucket: "my-bucket") |> range(start: -1m, stop: now()) ' \
+      "|> filter(fn: (r) => r._measurement == \"#{measurement}\")"
+
+    count = 0
+    @client.create_query_api.query_stream(query: query).each do |record|
+      count += 1
+      assert_equal measurement, record.measurement
+      assert_equal 'europe', record.values['location']
+      assert_equal count, record.value
+      assert_equal 'level', record.field
+    end
+
+    assert_equal 10, count
+  end
+
+  def test_query_stream_break
+    measurement = 'h2o_query_stream_break' + @now.to_i.to_s + @now.nsec.to_s
+    _write(20, measurement: measurement)
+
+    query = 'from(bucket: "my-bucket") |> range(start: -1m, stop: now()) ' \
+      "|> filter(fn: (r) => r._measurement == \"#{measurement}\")"
+
+    records = []
+
+    parser = @client.create_query_api.query_stream(query: query)
+
+    assert_equal false, parser.closed
+
+    count = 0
+    parser.each do |record|
+      records.push(record)
+      count += 1
+
+      break if count >= 5
+    end
+
+    assert_equal 5, records.size
+    assert_equal true, parser.closed
+
+    # record 1
+    record = records[0]
+    assert_equal measurement, record.measurement
+    assert_equal 'europe', record.values['location']
+    assert_equal 1, record.value
+    assert_equal 'level', record.field
+  end
+
+  private
+
+  def _write(values, measurement:)
+    write_api = @client.create_write_api
+
+    (1..values).each do |value|
+      write_api.write(data: InfluxDB2::Point.new(name: measurement)
+                                 .add_tag('location', 'europe')
+                                 .add_field('level', value)
+                                 .time(@now - values + value, InfluxDB2::WritePrecision::NANOSECOND))
+    end
+  end
+end

data/test/influxdb/query_api_test.rb

@@ -0,0 +1,75 @@
+# The MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'test_helper'
+
+class QueryApiTest < MiniTest::Test
+  def setup
+    WebMock.disable_net_connect!
+  end
+
+  SUCCESS_DATA = '#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,' \
+    "long,string,string,string,string\n" \
+    "#group,false,false,false,false,false,false,false,false,false,true\n" + "#default,_result,,,,,,,,,\n" \
+    ",result,table,_start,_stop,_time,_value,_field,_measurement,host,region\n" \
+    ",,0,1970-01-01T00:00:10Z,1970-01-01T00:00:20Z,1970-01-01T00:00:10Z,10,free,mem,A,west\n" \
+    ",,0,1970-01-01T00:00:10Z,1970-01-01T00:00:20Z,1970-01-01T00:00:10Z,20,free,mem,B,west\n" \
+    ",,0,1970-01-01T00:00:20Z,1970-01-01T00:00:30Z,1970-01-01T00:00:20Z,11,free,mem,A,west\n" \
+    ',,0,1970-01-01T00:00:20Z,1970-01-01T00:00:30Z,1970-01-01T00:00:20Z,22,free,mem,B,west'
+
+  def test_query_raw
+    stub_request(:post, 'http://localhost:9999/api/v2/query?org=my-org')
+      .to_return(body: SUCCESS_DATA)
+    client = InfluxDB2::Client.new('http://localhost:9999', 'my-token',
+                                   bucket: 'my-bucket',
+                                   org: 'my-org',
+                                   use_ssl: false)
+
+    bucket = 'my-bucket'
+    result = client.create_query_api.query_raw(query:
+      'from(bucket:"' + bucket + '") |> range(start: 1970-01-01T00:00:00.000000001Z) |> last()')
+
+    assert_equal result, SUCCESS_DATA
+  end
+
+  def test_query
+    stub_request(:post, 'http://localhost:9999/api/v2/query?org=my-org')
+      .to_return(body: SUCCESS_DATA)
+
+    client = InfluxDB2::Client.new('http://localhost:9999', 'my-token',
+                                   bucket: 'my-bucket',
+                                   org: 'my-org',
+                                   use_ssl: false)
+
+    bucket = 'my-bucket'
+    result = client.create_query_api.query(query:
+      'from(bucket:"' + bucket + '") |> range(start: 1970-01-01T00:00:00.000000001Z) |> last()')
+
+    assert_equal 1, result.length
+    assert_equal 4, result[0].records.length
+
+    record1 = result[0].records[0]
+
+    assert_equal Time.parse('1970-01-01T00:00:10Z').to_datetime.rfc3339, record1.time
+    assert_equal 'mem', record1.measurement
+    assert_equal 10, record1.value
+    assert_equal 'free', record1.field
+  end
+end

data/test/influxdb/write_api_batching_test.rb

@@ -0,0 +1,153 @@
+# The MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'test_helper'
+
+class WriteApiBatchingTest < MiniTest::Test
+  def setup
+    WebMock.disable_net_connect!
+
+    @write_options = InfluxDB2::WriteOptions.new(write_type: InfluxDB2::WriteType::BATCHING,
+                                                 batch_size: 2, 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)
+  end
+
+  def teardown
+    @client.close!
+
+    assert_equal true, @write_client.closed
+
+    WebMock.reset!
+  end
+
+  def test_batch_size
+    stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 204)
+
+    @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')
+    @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=4.0 4')
+
+    sleep(1)
+
+    request1 = "h2o_feet,location=coyote_creek level\\ water_level=1.0 1\n" \
+               'h2o_feet,location=coyote_creek level\\ water_level=2.0 2'
+    request2 = "h2o_feet,location=coyote_creek level\\ water_level=3.0 3\n" \
+               'h2o_feet,location=coyote_creek level\\ water_level=4.0 4'
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request1)
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request2)
+  end
+
+  def test_batch_size_group_by
+    stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 204)
+    stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=s')
+      .to_return(status: 204)
+    stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org-a&precision=ns')
+      .to_return(status: 204)
+    stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket2&org=my-org-a&precision=ns')
+      .to_return(status: 204)
+
+    bucket = 'my-bucket'
+    bucket2 = 'my-bucket2'
+    org_a = 'my-org-a'
+
+    @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=1.0 1', bucket: bucket, org: 'my-org')
+    @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=2.0 2', bucket: bucket, org: 'my-org',
+                        precision: InfluxDB2::WritePrecision::SECOND)
+    @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=3.0 3', bucket: bucket, org: org_a)
+    @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=4.0 4', bucket: bucket, org: org_a)
+    @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=5.0 5', bucket: bucket2, org: org_a)
+    @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=6.0 6', bucket: bucket, org: org_a)
+
+    sleep(1)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: 'h2o_feet,location=coyote_creek level\\ water_level=1.0 1')
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=s',
+                     times: 1, body: 'h2o_feet,location=coyote_creek level\\ water_level=2.0 2')
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org-a&precision=ns',
+                     times: 1, body: "h2o_feet,location=coyote_creek level\\ water_level=3.0 3\n" \
+                    'h2o_feet,location=coyote_creek level\\ water_level=4.0 4')
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket2&org=my-org-a&precision=ns',
+                     times: 1, body: 'h2o_feet,location=coyote_creek level\\ water_level=5.0 5')
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org-a&precision=ns',
+                     times: 1, body: 'h2o_feet,location=coyote_creek level\\ water_level=6.0 6')
+  end
+
+  def test_flush_interval
+    stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 204)
+
+    request1 = "h2o_feet,location=coyote_creek level\\ water_level=1.0 1\n" \
+               'h2o_feet,location=coyote_creek level\\ water_level=2.0 2'
+    request2 = 'h2o_feet,location=coyote_creek level\\ water_level=3.0 3'
+
+    @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')
+
+    sleep(1)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request1)
+
+    @write_client.write(data: 'h2o_feet,location=coyote_creek level\\ water_level=3.0 3')
+
+    sleep(2)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 0, body: request2)
+
+    sleep(3)
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: request2)
+  end
+
+  def test_flush_all_by_close_client
+    stub_request(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 204)
+
+    @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')
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 0, body: 'h2o_feet,location=coyote_creek level\\ water_level=3.0 3')
+
+    @client.close!
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
+                     times: 1, body: "h2o_feet,location=coyote_creek level\\ water_level=1.0 1\n" \
+                     "h2o_feet,location=coyote_creek level\\ water_level=2.0 2\n" \
+                     'h2o_feet,location=coyote_creek level\\ water_level=3.0 3')
+  end
+end

data/test/test_helper.rb

@@ -19,7 +19,10 @@
 # THE SOFTWARE.
 
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  add_filter 'lib/influxdb2/client/models/'
+  add_filter 'test/influxdb'
+end
 
 if ENV['CI'] == 'true'
   require 'codecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.191
+  version: 1.1.0.pre.459
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".circleci/setup-rubygems.sh"
+- ".codecov.yml"
 - ".github/PULL_REQUEST_TEMPLATE"
 - ".gitignore"
 - ".rubocop.yml"
@@ -139,17 +140,32 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/generate-sources.sh
 - bin/influxdb-onboarding.sh
 - bin/influxdb-restart.sh
+- bin/pom.xml
+- bin/swagger.yml
 - influxdb-client.gemspec
 - lib/influxdb2/client.rb
 - lib/influxdb2/client/client.rb
+- lib/influxdb2/client/default_api.rb
+- lib/influxdb2/client/flux_csv_parser.rb
+- lib/influxdb2/client/flux_table.rb
 - lib/influxdb2/client/influx_error.rb
+- lib/influxdb2/client/models/dialect.rb
+- lib/influxdb2/client/models/query.rb
 - lib/influxdb2/client/point.rb
+- lib/influxdb2/client/query_api.rb
 - lib/influxdb2/client/version.rb
+- lib/influxdb2/client/worker.rb
 - lib/influxdb2/client/write_api.rb
 - test/influxdb/client_test.rb
+- test/influxdb/flux_csv_parser_test.rb
 - test/influxdb/point_test.rb
+- test/influxdb/query_api_integration_test.rb
+- test/influxdb/query_api_stream_test.rb
+- test/influxdb/query_api_test.rb
+- test/influxdb/write_api_batching_test.rb
 - test/influxdb/write_api_integration_test.rb
 - test/influxdb/write_api_test.rb
 - test/test_helper.rb
@@ -181,7 +197,12 @@ specification_version: 4
 summary: Ruby library for InfluxDB 2.
 test_files:
 - test/influxdb/client_test.rb
+- test/influxdb/flux_csv_parser_test.rb
 - test/influxdb/point_test.rb
+- test/influxdb/query_api_integration_test.rb
+- test/influxdb/query_api_stream_test.rb
+- test/influxdb/query_api_test.rb
+- test/influxdb/write_api_batching_test.rb
 - test/influxdb/write_api_integration_test.rb
 - test/influxdb/write_api_test.rb
 - test/test_helper.rb