influxdb 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8d85c5412cee2eed247a9dc36cdd93063dab1006
-  data.tar.gz: fb4ea80422af475ec2af1d94918e7682a424537d
+SHA256:
+  metadata.gz: c280c4f839a7d00e2c716226f06987df217edebbf7149bf309906b8b34ea2e26
+  data.tar.gz: 3dc453ebb5a914de3e364da388255d7d38e266a468dce14dc9a7e5f9e7a2b273
 SHA512:
-  metadata.gz: 738b8b9a2ce516b1957c4afcdf7a4ab2ef710ddb088bd711ef55f815f11d57a1422bbc67db1d83574fb81ae98441c70d12c4c8a8cfe7bbc3029724d5c3156dae
-  data.tar.gz: d70c7129fc4e0f4a7a3b5732826128f168dedd3dcabfe7affdc5816c6c2718fea289368d3d3749aa6956deec7d899ebf9e5334af93293eed38e22635a5ff4e4b
+  metadata.gz: b4b0f7d6475d31e3506e4c3979548c56cd70bd9c632ba77b6d3a8fae26cc3b2885c34662848ed1096a456b2156347c8f6b8b7746ca5b68cd170f877d6b5409c4
+  data.tar.gz: 72a5903843c25150e2daf01c31f57f3636a3f7730183704c111a6c6be5c42ed84cd42970087087292328f6ecce7ffa20313a87e09644b8199eadcd639f5c6733

data/.gitignore

@@ -21,3 +21,5 @@ Gemfile.lock
 _yardoc
 doc/
 *.local
+
+/noaa.txt

data/.rubocop.yml

@@ -40,6 +40,9 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Max: 6
 
+Naming/UncommunicativeMethodParamName:
+  AllowedNames: [io, id, db]
+
 Style/FormatStringToken:
   Enabled: false
 
@@ -55,8 +58,12 @@ Style/RescueModifier:
 Style/StringLiterals:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: comma
   Exclude:
   - "spec/**/*.rb"
 
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+  Exclude:
+  - "spec/**/*.rb"

data/.travis.yml

@@ -7,9 +7,10 @@ before_install:
   - gem update bundler --no-doc
   - bin/provision.sh
 rvm:
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.2.9
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - ruby-head
 env:
   - TEST_TASK=spec
@@ -19,25 +20,27 @@ matrix:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: jruby-9.1.5.0
-    - rvm: 2.4.2
+    - rvm: 2.5.1
       env: influx_version=nightly channel=nightlies
   include:
-    - rvm: 2.4.2
+    - rvm: 2.5.1
       env: TEST_TASK=rubocop
     - rvm: jruby-9.1.5.0
     - rvm: jruby-head
       env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
-    - rvm: 2.4.2
+    - rvm: 2.5.1
       env: influx_version=1.0.2 pkghash=3e4c349cb57507913d9abda1459bdbed
-    - rvm: 2.4.2
+    - rvm: 2.5.1
       env: influx_version=1.1.0 pkghash=682904c350ecfc2a60ec9c6c08453ef2
-    - rvm: 2.4.2
+    - rvm: 2.5.1
       env: influx_version=1.2.4 pkghash=0545d67217393282188e5d5cdedfdc85
-    - rvm: 2.4.2
+    - rvm: 2.5.1
       env: influx_version=1.3.6 pkghash256=6406cdd21466bcb832b967078adaa9f07cb6ae524a6579c15141692031f5f840
-    - rvm: 2.4.2
-      env: influx_version=1.4.2 pkghash256=96ced90cfc436da7833721fd635b9942f9175cff2f897c113ef068f224cf8605
-    - rvm: 2.4.2
+    - rvm: 2.5.1
+      env: influx_version=1.4.3 pkghash256=0477080f1d1cf8e1242dc7318280b9010c4c45cf6a415a2a5de607ae17fa0359
+    - rvm: 2.5.1
+      env: influx_version=1.5.2 pkghash256=42fede7b497bdf30d4eb5138db218d1add986fca4fce4a8bcd9c7d6dabaf572a
+    - rvm: 2.5.1
       env: influx_version=nightly channel=nightlies
   fail_fast: true
 addons:

data/CHANGELOG.md

@@ -2,9 +2,14 @@
 
 For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/commits/master).
 
-## Unreleased changes
+## v0.6.0, released 2018-07-10
 
-- None.
+- Add batch query support via `InfluxDB::Client#batch` (and using
+  `InfluxDB::Query::Batch`). Using multiple queries joined with `;`
+  will cause issues with `Client#query` in combination with either
+  `GROUP BY` clauses or empty results, as discussed in #217.
+
+  Initial code and PR#218 from @satyanash.
 
 ## v0.5.3, released 2018-01-19
 

data/README.md

@@ -161,9 +161,7 @@ this, your points will be squashed!**
 > field set and the new field set, where any ties go to the new field set. This
 > is the intended behavior.
 
-See [How does InfluxDB handle duplicate
-points?](https://docs.influxdata.com/influxdb/v1.3/troubleshooting/frequently-asked-questions/#how-does-influxdb-handle-duplicate-points)
-for details.
+See [How does InfluxDB handle duplicate points?][docs-faq] for details.
 
 For example, this is how to specify millisecond precision (which moves the
 pitfall from the second- to the millisecond barrier):
@@ -172,7 +170,7 @@ pitfall from the second- to the millisecond barrier):
 influxdb = InfluxDB::Client.new(time_precision: "ms")
 time = (Time.now.to_r * 1000).to_i
 # A faster, albeit less readable alternative:
-# time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
+# time = Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)
 influxdb.write_point("foobar", { values: { n: 42 }, timestamp: time })
 ```
 
@@ -682,8 +680,7 @@ influxdb = InfluxDB::Client.new database,
   chunk_size: 10000
 ```
 
-See the [official documentation](http://docs.influxdata.com/influxdb/v0.13/guides/querying_data/#chunking)
-for more details.
+See the [official documentation][docs-chunking] for more details.
 
 
 #### Retry

data/Rakefile

@@ -21,7 +21,7 @@ else
 end
 
 task :console do
-  lib = File.expand_path("../lib", __FILE__)
+  lib = File.expand_path("lib", __dir__)
   $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
   require "influxdb"
 

data/influxdb.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'influxdb/version'
 

data/lib/influxdb.rb

@@ -8,13 +8,16 @@ require "influxdb/config"
 require "influxdb/writer/async"
 require "influxdb/writer/udp"
 
-require "influxdb/query/core"
+require "influxdb/query/batch"
+require "influxdb/query/builder"
 require "influxdb/query/cluster"
-require "influxdb/query/database"
-require "influxdb/query/user"
 require "influxdb/query/continuous_query"
+require "influxdb/query/core"
+require "influxdb/query/core"
+require "influxdb/query/database"
 require "influxdb/query/retention_policy"
 require "influxdb/query/series"
+require "influxdb/query/user"
 
 require "influxdb/client/http"
 require "influxdb/client"

data/lib/influxdb/point_value.rb

@@ -30,18 +30,18 @@ module InfluxDB
 
     private_constant :ESCAPES
 
-    def escape(s, type)
+    def escape(str, type)
       # rubocop:disable Layout/AlignParameters
-      s = s.encode "UTF-8".freeze, "UTF-8".freeze,
+      str = str.encode "UTF-8".freeze, "UTF-8".freeze,
         invalid: :replace,
         undef: :replace,
         replace: "".freeze
       # rubocop:enable Layout/AlignParameters
 
       ESCAPES[type].each do |ch|
-        s = s.gsub(ch) { "\\#{ch}" }
+        str = str.gsub(ch) { "\\#{ch}" }
       end
-      s
+      str
     end
 
     def escape_values(values)

data/lib/influxdb/query/batch.rb

@@ -0,0 +1,91 @@
+module InfluxDB
+  module Query
+    # Batch collects multiple queries and executes them together.
+    #
+    # You shouldn't use Batch directly, instead call Client.batch, which
+    # constructs a new batch for you.
+    class Batch
+      attr_reader :client, :statements
+
+      def initialize(client)
+        @client     = client
+        @statements = []
+
+        yield self if block_given?
+      end
+
+      def add(query, params: nil)
+        statements << client.builder.build(query.chomp(";"), params)
+        statements.size - 1
+      end
+
+      def execute(
+        denormalize:  config.denormalize,
+        chunk_size:   config.chunk_size,
+        **opts,
+        &block
+      )
+        return [] if statements.empty?
+
+        url = full_url "/query".freeze, query_params(statements.join(";"), opts)
+        series = fetch_series get(url, parse: true, json_streaming: !chunk_size.nil?)
+
+        if denormalize
+          build_denormalized_result(series, &block)
+        else
+          build_result(series, &block)
+        end
+      end
+
+      private
+
+      def build_result(series)
+        return series.values unless block_given?
+
+        series.each do |id, statement_results|
+          statement_results.each do |s|
+            yield id, s["name".freeze], s["tags".freeze], raw_values(s)
+          end
+
+          # indicate empty result: yield useful amount of "nothing"
+          yield id, nil, {}, [] if statement_results.empty?
+        end
+      end
+
+      def build_denormalized_result(series)
+        return series.map { |_, s| denormalized_series_list(s) } unless block_given?
+
+        series.each do |id, statement_results|
+          statement_results.each do |s|
+            yield id, s["name".freeze], s["tags".freeze], denormalize_series(s)
+          end
+
+          # indicate empty result: yield useful amount of "nothing"
+          yield id, nil, {}, [] if statement_results.empty?
+        end
+      end
+
+      def fetch_series(response)
+        response.fetch("results".freeze).each_with_object({}) do |result, list|
+          sid = result["statement_id".freeze]
+          list[sid] = result.fetch("series".freeze, [])
+        end
+      end
+
+      # build simple method delegators
+      %i[
+        config
+        full_url
+        query_params
+        get
+        raw_values
+        denormalize_series
+        denormalized_series_list
+      ].each do |method_name|
+        define_method(method_name) do |*args|
+          client.send method_name, *args
+        end
+      end
+    end
+  end
+end

data/lib/influxdb/query/core.rb

@@ -1,3 +1,4 @@
+require_relative 'batch'
 require_relative 'builder'
 
 module InfluxDB
@@ -37,7 +38,10 @@ module InfluxDB
           denormalize ? denormalized_series_list(series) : series
         end
       end
-      # rubocop:enable Metrics/MethodLength
+
+      def batch(&block)
+        Batch.new self, &block
+      end
 
       # Example:
       # write_points([
@@ -82,11 +86,11 @@ module InfluxDB
       private
 
       def query_params(
-          query,
-          precision:  config.time_precision,
-          epoch:      config.epoch,
-          chunk_size: config.chunk_size,
-          database:   config.database
+        query,
+        precision:  config.time_precision,
+        epoch:      config.epoch,
+        chunk_size: config.chunk_size,
+        database:   config.database
       )
         params = { q: query, db: database }
         params[:precision] = precision if precision

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB # :nodoc:
-  VERSION = "0.5.3".freeze
+  VERSION = "0.6.0".freeze
 end

data/spec/influxdb/cases/query_batch_spec.rb

@@ -0,0 +1,150 @@
+require "spec_helper"
+
+describe InfluxDB::Client do
+  let :client do
+    described_class.new \
+      database:       "database",
+      host:           "influxdb.test",
+      port:           9999,
+      username:       "username",
+      password:       "password",
+      time_precision: "s"
+  end
+
+  describe "#batch" do
+    it { expect(client.batch).to be_a InfluxDB::Query::Batch }
+
+    describe "#execute" do
+      # it also doesn't perform a network request
+      it { expect(client.batch.execute).to eq [] }
+    end
+
+    describe "#add" do
+      let :queries do
+        [
+          "select * from foo",
+          "create user bar",
+          "drop measurement grok",
+        ]
+      end
+
+      it "returns statement id" do
+        batch = client.batch
+        ids = queries.map { |q| batch.add(q) }
+        expect(ids).to eq [0, 1, 2]
+        expect(batch.statements.size).to be 3
+      end
+
+      context "block form" do
+        it "returns statement id" do
+          batch = client.batch do |b|
+            ids = queries.map { |q| b.add(q) }
+            expect(ids).to eq [0, 1, 2]
+          end
+          expect(batch.statements.size).to be 3
+        end
+      end
+    end
+  end
+
+  describe "#batch.execute" do
+    context "with multiple queries when there is no data for a query" do
+      let :queries do
+        [
+          "SELECT value FROM requests_per_minute WHERE time > 1437019900",
+          "SELECT value FROM requests_per_minute WHERE time > now()",
+          "SELECT value FROM requests_per_minute WHERE time > 1437019900",
+        ]
+      end
+
+      subject do
+        client.batch do |b|
+          queries.each { |q| b.add(q) }
+        end
+      end
+
+      let :response do
+        { "results" => [{ "statement_id" => 0,
+                          "series" => [{ "name" => "requests_per_minute",
+                                         "columns" => %w[time value],
+                                         "values" => [%w[2018-04-02T00:00:00Z 204]] }] },
+                        { "statement_id" => 1 },
+                        { "statement_id" => 2,
+                          "series" => [{ "name" => "requests_per_minute",
+                                         "columns" => %w[time value],
+                                         "values" => [%w[2018-04-02T00:00:00Z 204]] }] }] }
+      end
+
+      let :expected_result do
+        [
+          [{ "name" => "requests_per_minute",
+             "tags" => nil,
+             "values" => [{ "time" => "2018-04-02T00:00:00Z",
+                            "value" => "204" }] }],
+          [],
+          [{ "name" => "requests_per_minute",
+             "tags" => nil,
+             "values" => [{ "time" => "2018-04-02T00:00:00Z",
+                            "value" => "204" }] }],
+        ]
+      end
+
+      before do
+        stub_request(:get, "http://influxdb.test:9999/query")
+          .with(query: hash_including(db: "database", precision: "s", u: "username", p: "password"))
+          .to_return(body: JSON.generate(response), status: 200)
+      end
+
+      it "should return responses for all statements" do
+        result = subject.execute
+        expect(result.length).to eq(response["results"].length)
+        expect(result).to eq expected_result
+      end
+    end
+
+    context "with a group by tag query" do
+      let :queries do
+        ["SELECT value FROM requests_per_minute WHERE time > now() - 1d GROUP BY status_code"]
+      end
+
+      subject do
+        client.batch { |b| queries.each { |q| b.add q } }
+      end
+
+      let :response do
+        { "results" => [{ "statement_id" => 0,
+                          "series" => [{ "name" => "requests_per_minute",
+                                         "tags" => { "status_code" => "200" },
+                                         "columns" => %w[time value],
+                                         "values" => [%w[2018-04-02T00:00:00Z 204]] },
+                                       { "name" => "requests_per_minute",
+                                         "tags" => { "status_code" => "500" },
+                                         "columns" => %w[time value],
+                                         "values" => [%w[2018-04-02T00:00:00Z 204]] }] }] }
+      end
+
+      let :expected_result do
+        [[{ "name" => "requests_per_minute",
+            "tags" => { "status_code" => "200" },
+            "values" => [{ "time" => "2018-04-02T00:00:00Z",
+                           "value" => "204" }] },
+          { "name" => "requests_per_minute",
+            "tags" => { "status_code" => "500" },
+            "values" => [{ "time" => "2018-04-02T00:00:00Z",
+                           "value" => "204" }] }]]
+      end
+
+      before do
+        stub_request(:get, "http://influxdb.test:9999/query")
+          .with(query: hash_including(db: "database", precision: "s", u: "username", p: "password"))
+          .to_return(body: JSON.generate(response), status: 200)
+      end
+
+      it "should return a single result" do
+        result = subject.execute
+        expect(result.length).to eq(response["results"].length)
+        expect(result).to eq expected_result
+      end
+    end
+  end
+end

data/spec/influxdb/cases/query_cluster_spec.rb

@@ -3,16 +3,13 @@ require "json"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new(
-      "database",
-      {
-        host: "influxdb.test",
-        port: 9999,
-        username: "username",
-        password: "password",
-        time_precision: "s"
-      }.merge(args)
-    )
+    described_class.new "database", {
+      host:           "influxdb.test",
+      port:           9999,
+      username:       "username",
+      password:       "password",
+      time_precision: "s",
+    }.merge(args)
   end
 
   let(:args) { {} }

data/spec/influxdb/cases/query_continuous_query_spec.rb

@@ -3,20 +3,15 @@ require "json"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new(
-      "database",
-      {
-        host: "influxdb.test",
-        port: 9999,
-        username: "username",
-        password: "password",
-        time_precision: "s"
-      }.merge(args)
-    )
+    described_class.new \
+      database:       "database",
+      host:           "influxdb.test",
+      port:           9999,
+      username:       "username",
+      password:       "password",
+      time_precision: "s"
   end
 
-  let(:args) { {} }
-
   describe "#list_continuous_queries" do
     let(:query) { "SHOW CONTINUOUS QUERIES" }
     let(:database) { "testdb" }
@@ -108,10 +103,10 @@ describe InfluxDB::Client do
     let(:name) { "event_counts_per_10m_by_type" }
     let(:database) { "testdb" }
     let(:query) { "DROP CONTINUOUS QUERY #{name} ON #{database}" }
+
     before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: query }
-      )
+      stub_request(:get, "http://influxdb.test:9999/query")
+        .with(query: { u: "username", p: "password", q: query })
     end
 
     it "should GET to remove continuous query" do

data/spec/influxdb/cases/query_core_spec.rb

@@ -2,20 +2,19 @@ require "spec_helper"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new "database", {
-      host: "influxdb.test",
-      port: 9999,
-      username: "username",
-      password: "password",
+    described_class.new \
+      database:       "database",
+      host:           "influxdb.test",
+      port:           9999,
+      username:       "username",
+      password:       "password",
       time_precision: "s"
-    }.merge(args)
   end
 
-  let(:args) { {} }
-
   describe "#query" do
     let(:query) { "SELECT value FROM requests_per_minute WHERE time > 1437019900" }
-    let(:response) do
+
+    let :response do
       { "results" => [{ "statement_id" => 0,
                         "series" => [{ "name" => "requests_per_minute",
                                        "columns" => %w[time value] }] }] }

data/spec/influxdb/cases/query_database_spec.rb

@@ -3,26 +3,22 @@ require "json"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new(
-      "database",
-      {
-        host: "influxdb.test",
-        port: 9999,
-        username: "username",
-        password: "password",
-        time_precision: "s"
-      }.merge(args)
-    )
+    described_class.new \
+      database:       "database",
+      host:           "influxdb.test",
+      port:           9999,
+      username:       "username",
+      password:       "password",
+      time_precision: "s"
   end
 
-  let(:args) { {} }
   let(:query) { nil }
   let(:response) { { "results" => [{ "statement_id" => 0 }] } }
 
   before do
-    stub_request(:get, "http://influxdb.test:9999/query").with(
-      query: { u: "username", p: "password", q: query }
-    ).to_return(body: JSON.generate(response))
+    stub_request(:get, "http://influxdb.test:9999/query")
+      .with(query: { u: "username", p: "password", q: query })
+      .to_return(body: JSON.generate(response))
   end
 
   describe "#create_database" do

data/spec/influxdb/cases/query_retention_policy_spec.rb

@@ -3,26 +3,22 @@ require "json"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new(
-      "database",
-      {
-        host: "influxdb.test",
-        port: 9999,
-        username: "username",
-        password: "password",
-        time_precision: "s"
-      }.merge(args)
-    )
+    described_class.new \
+      database:       "database",
+      host:           "influxdb.test",
+      port:           9999,
+      username:       "username",
+      password:       "password",
+      time_precision: "s"
   end
 
-  let(:args) { {} }
   let(:query) { nil }
   let(:response) { { "results" => [{ "statement_id" => 0 }] } }
 
   before do
-    stub_request(:get, "http://influxdb.test:9999/query").with(
-      query: { u: "username", p: "password", q: query }
-    ).to_return(body: JSON.generate(response))
+    stub_request(:get, "http://influxdb.test:9999/query")
+      .with(query: { u: "username", p: "password", q: query })
+      .to_return(body: JSON.generate(response))
   end
 
   describe "#list_retention_policies" do

data/spec/influxdb/cases/query_series_spec.rb

@@ -23,11 +23,9 @@ describe InfluxDB::Client do
     let(:query) { "SHOW SERIES" }
 
     before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: query, db: "database" }
-      ).to_return(
-        body: JSON.generate(response)
-      )
+      stub_request(:get, "http://influxdb.test:9999/query")
+        .with(query: { u: "username", p: "password", q: query, db: "database" })
+        .to_return(body: JSON.generate(response))
     end
 
     it "returns a list of all series names" do
@@ -40,11 +38,9 @@ describe InfluxDB::Client do
     let(:query) { "SHOW SERIES" }
 
     before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: query, db: "database" }
-      ).to_return(
-        body: JSON.generate(response)
-      )
+      stub_request(:get, "http://influxdb.test:9999/query")
+        .with(query: { u: "username", p: "password", q: query, db: "database" })
+        .to_return(body: JSON.generate(response))
     end
 
     it "returns a empty list" do
@@ -57,9 +53,8 @@ describe InfluxDB::Client do
     let(:query) { "DROP SERIES FROM #{name}" }
 
     before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: query, db: "database" }
-      )
+      stub_request(:get, "http://influxdb.test:9999/query")
+        .with(query: { u: "username", p: "password", q: query, db: "database" })
     end
 
     it "should GET to remove a database" do

data/spec/influxdb/cases/query_shard_spec.rb

@@ -3,20 +3,15 @@ require "json"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new(
-      "database",
-      {
-        host: "influxdb.test",
-        port: 9999,
-        username: "username",
-        password: "password",
-        time_precision: "s"
-      }.merge(args)
-    )
+    described_class.new \
+      database:       "database",
+      host:           "influxdb.test",
+      port:           9999,
+      username:       "username",
+      password:       "password",
+      time_precision: "s"
   end
 
-  let(:args) { {} }
-
   ### TODO ###
 
   # describe "GET #list_shards" do

data/spec/influxdb/cases/query_user_spec.rb

@@ -3,26 +3,22 @@ require "json"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new(
-      "database",
-      {
-        host: "influxdb.test",
-        port: 9999,
-        username: "username",
-        password: "password",
-        time_precision: "s"
-      }.merge(args)
-    )
+    described_class.new \
+      databse:        "database",
+      host:           "influxdb.test",
+      port:           9999,
+      username:       "username",
+      password:       "password",
+      time_precision: "s"
   end
 
-  let(:args) { {} }
   let(:query) { nil }
   let(:response) { { "results" => [{ "statement_id" => 0 }] } }
 
   before do
-    stub_request(:get, "http://influxdb.test:9999/query").with(
-      query: { u: "username", p: "password", q: query }
-    ).to_return(body: JSON.generate(response))
+    stub_request(:get, "http://influxdb.test:9999/query")
+      .with(query: { u: "username", p: "password", q: query })
+      .to_return(body: JSON.generate(response))
   end
 
   describe "#update user password" do

data/spec/influxdb/cases/query_with_params_spec.rb

@@ -2,17 +2,15 @@ require "spec_helper"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new "database", {
-      host: "influxdb.test",
-      port: 9999,
-      username: "username",
-      password: "password",
+    described_class.new \
+      database:       "database",
+      host:           "influxdb.test",
+      port:           9999,
+      username:       "username",
+      password:       "password",
       time_precision: "s"
-    }.merge(args)
   end
 
-  let(:args) { {} }
-
   describe "#query with parameters" do
     let(:query) { "SELECT value FROM requests_per_minute WHERE time > %{start}" }
     let(:query_params) { { start: 1_437_019_900 } }

data/spec/influxdb/cases/show_field_keys_spec.rb

@@ -3,20 +3,21 @@ require "json"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new "database",
-                        host:     "influxdb.test",
-                        port:     9999,
-                        username: "username",
-                        password: "password"
+    described_class.new \
+      database: "database",
+      host:     "influxdb.test",
+      port:     9999,
+      username: "username",
+      password: "password"
   end
 
   let(:query) { nil }
   let(:response) { { "results" => [{ "statement_id" => 0 }] } }
 
   before do
-    stub_request(:get, "http://influxdb.test:9999/query").with(
-      query: { u: "username", p: "password", q: query, db: "database" }
-    ).to_return(body: JSON.generate(response))
+    stub_request(:get, "http://influxdb.test:9999/query")
+      .with(query: { u: "username", p: "password", q: query, db: "database" })
+      .to_return(body: JSON.generate(response))
   end
 
   describe "#show_field_keys" do

data/spec/influxdb/cases/write_points_spec.rb

@@ -3,17 +3,15 @@ require "json"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new "database", {
-      host: "influxdb.test",
-      port: 9999,
-      username: "username",
-      password: "password",
+    described_class.new \
+      database:       "database",
+      host:           "influxdb.test",
+      port:           9999,
+      username:       "username",
+      password:       "password",
       time_precision: "s"
-    }.merge(args)
   end
 
-  let(:args) { {} }
-
   let(:database) { subject.config.database }
 
   describe "#write_point" do

data/spec/smoke/smoke_batch_spec.rb

@@ -0,0 +1,114 @@
+require "spec_helper"
+
+describe InfluxDB::Client, smoke: true, if: min_influx_version("1.2.0") do
+  before do
+    WebMock.allow_net_connect!
+  end
+
+  after do
+    WebMock.disable_net_connect!
+  end
+
+  let(:client) do
+    InfluxDB::Client.new \
+      database: "NOAA_water_database",
+      username: "test_user",
+      password: "resu_tset",
+      retry:    4
+  end
+
+  let :queries do
+    [
+      "select count(water_level) from h2o_feet where location = 'santa_monica'",
+      "select * from h2o_feet where time > now()", # empty result
+      "select count(water_level) from h2o_feet where location = 'coyote_creek'",
+    ]
+  end
+
+  it "#query filters empty results incorrect result" do
+    results = client.query(queries.join(";"))
+    expect(results.size).to be 2 # but should be 3!
+    expect(results[0]["values"][0]["count"]).to be 7654
+    expect(results[1]["values"][0]["count"]).to be 7604
+  end
+
+  context "#batch.execute" do
+    it "returns expected results" do
+      results = client.batch do |b|
+        queries.each { |q| b.add(q) }
+      end.execute
+
+      expect(results.size).to be 3
+      expect(results[0][0]["values"][0]["count"]).to be 7654
+      expect(results[1]).to eq []
+      expect(results[2][0]["values"][0]["count"]).to be 7604
+    end
+
+    it "with block yields statement id" do
+      batch = client.batch do |b|
+        queries.each { |q| b.add(q) }
+      end
+
+      batch.execute do |sid, _, _, values|
+        case sid
+        when 0
+          expect(values[0]["count"]).to be 7654
+        when 1
+          expect(values).to eq []
+        when 2
+          expect(values[0]["count"]).to be 7604
+        end
+      end
+    end
+
+    context "with tags" do
+      let :queries do
+        [
+          "select count(water_level) from h2o_feet group by location",
+          "select * from h2o_feet where time > now()", # empty result
+        ]
+      end
+
+      it "returns expected results" do
+        results = client.batch do |b|
+          queries.each { |q| b.add(q) }
+        end.execute
+
+        expect(results.size).to be 2
+        results[0].each do |res|
+          location = res["tags"]["location"]
+          expect(%w[coyote_creek santa_monica]).to include location
+
+          value = location == "santa_monica" ? 7654 : 7604
+          expect(res["values"][0]["count"]).to be value
+        end
+      end
+
+      it "with block yields statement id" do
+        batch = client.batch do |b|
+          queries.each { |q| b.add(q) }
+        end
+
+        got_santa_monica = got_coyote_creek = got_empty_result = false
+
+        batch.execute do |sid, _, tags, values|
+          case [sid, tags["location"]]
+          when [0, "santa_monica"]
+            expect(values[0]["count"]).to be 7654
+            got_santa_monica = true
+          when [0, "coyote_creek"]
+            expect(values[0]["count"]).to be 7604
+            got_coyote_creek = true
+          when [1, nil]
+            expect(values).to eq []
+            got_empty_result = true
+          end
+        end
+
+        expect(got_coyote_creek).to be true
+        expect(got_santa_monica).to be true
+        expect(got_empty_result).to be true
+      end
+    end
+  end
+end

data/spec/smoke/smoke_spec.rb

@@ -10,10 +10,11 @@ describe InfluxDB::Client, smoke: true do
   end
 
   let(:client) do
-    InfluxDB::Client.new(database: "NOAA_water_database",
-                         username: "test_user",
-                         password: "resu_tset",
-                         retry: 4)
+    InfluxDB::Client.new \
+      database: "NOAA_water_database",
+      username: "test_user",
+      password: "resu_tset",
+      retry:    4
   end
 
   context "connects to the database" do
@@ -56,4 +57,21 @@ describe InfluxDB::Client, smoke: true do
       expect(result).to include(sample_data2)
     end
   end
+
+  context "batch query" do
+    let :queries do
+      [
+        "select count(water_level) from h2o_feet where location = 'santa_monica'",
+        "select * from h2o_feet where time > now()", # empty result
+        "select count(water_level) from h2o_feet where location = 'coyote_creek'",
+      ]
+    end
+
+    it "#query filters empty results incorrect result" do
+      results = client.query(queries.join(";"))
+      expect(results.size).to be 2 # but should be 3!
+      expect(results[0]["values"][0]["count"]).to be 7654
+      expect(results[1]["values"][0]["count"]).to be 7604
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -8,10 +8,16 @@ rescue LoadError
 end
 # rubocop:enable Lint/HandleExceptions
 
+def min_influx_version(version)
+  current = Gem::Version.new ENV.fetch("influx_version", "0")
+  current >= Gem::Version.new(version)
+end
+
 RSpec.configure do |config|
   config.color = ENV["TRAVIS"] != "true"
   config.filter_run_excluding smoke: ENV["TRAVIS"] != "true" || !ENV.key?("influx_version")
   puts "SMOKE TESTS ARE NOT CURRENTLY RUNNING" if ENV["TRAVIS"] != "true"
+
   # rubocop:disable Style/ConditionalAssignment
   if config.files_to_run.one? || ENV["TRAVIS"] == "true"
     config.formatter = :documentation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ files:
 - lib/influxdb/logging.rb
 - lib/influxdb/max_queue.rb
 - lib/influxdb/point_value.rb
+- lib/influxdb/query/batch.rb
 - lib/influxdb/query/builder.rb
 - lib/influxdb/query/cluster.rb
 - lib/influxdb/query/continuous_query.rb
@@ -117,13 +118,13 @@ files:
 - lib/influxdb/writer/async.rb
 - lib/influxdb/writer/udp.rb
 - spec/influxdb/cases/async_client_spec.rb
+- spec/influxdb/cases/query_batch_spec.rb
 - spec/influxdb/cases/query_cluster_spec.rb
 - spec/influxdb/cases/query_continuous_query_spec.rb
 - spec/influxdb/cases/query_core_spec.rb
 - spec/influxdb/cases/query_database_spec.rb
 - spec/influxdb/cases/query_retention_policy_spec.rb
 - spec/influxdb/cases/query_series_spec.rb
-- spec/influxdb/cases/query_shard_space_spec.rb
 - spec/influxdb/cases/query_shard_spec.rb
 - spec/influxdb/cases/query_user_spec.rb
 - spec/influxdb/cases/query_with_params_spec.rb
@@ -140,6 +141,7 @@ files:
 - spec/influxdb/point_value_spec.rb
 - spec/influxdb/query_builder_spec.rb
 - spec/influxdb/worker_spec.rb
+- spec/smoke/smoke_batch_spec.rb
 - spec/smoke/smoke_spec.rb
 - spec/spec_helper.rb
 homepage: http://influxdb.org
@@ -162,19 +164,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Ruby library for InfluxDB.
 test_files:
 - spec/influxdb/cases/async_client_spec.rb
+- spec/influxdb/cases/query_batch_spec.rb
 - spec/influxdb/cases/query_cluster_spec.rb
 - spec/influxdb/cases/query_continuous_query_spec.rb
 - spec/influxdb/cases/query_core_spec.rb
 - spec/influxdb/cases/query_database_spec.rb
 - spec/influxdb/cases/query_retention_policy_spec.rb
 - spec/influxdb/cases/query_series_spec.rb
-- spec/influxdb/cases/query_shard_space_spec.rb
 - spec/influxdb/cases/query_shard_spec.rb
 - spec/influxdb/cases/query_user_spec.rb
 - spec/influxdb/cases/query_with_params_spec.rb
@@ -191,5 +193,6 @@ test_files:
 - spec/influxdb/point_value_spec.rb
 - spec/influxdb/query_builder_spec.rb
 - spec/influxdb/worker_spec.rb
+- spec/smoke/smoke_batch_spec.rb
 - spec/smoke/smoke_spec.rb
 - spec/spec_helper.rb

data/spec/influxdb/cases/query_shard_space_spec.rb

@@ -1,105 +0,0 @@
-# TODO: support 0.9.x
-
-# require "spec_helper"
-# require "json"
-
-# describe InfluxDB::Client do
-#   let(:subject) do
-#     described_class.new(
-#       "database",
-#       {
-#         host: "influxdb.test",
-#         port: 9999,
-#         username: "username",
-#         password: "password",
-#         time_precision: "s"
-#       }.merge(args)
-#     )
-#   end
-
-#   let(:args) { {} }
-
-#   let(:url) { "http://influxdb.test:9999/cluster/shard_spaces" }
-#   let(:req_query) { { u: "username", p: "password" } }
-#   let(:req_body) { nil }
-#   let(:request_params) { { query: req_query, body: req_body } }
-#   let(:response) { { body: JSON.generate(shard_spaces), status: 200 } }
-#   let(:shard_spaces)   { [subject.default_shard_space_options.merge("database" => "foo")] }
-
-#   context "GET methods" do
-#     before { stub_request(:get, url).with(request_params).to_return(response) }
-
-#     describe "GET #list_shard_spaces" do
-#       it 'returns OK' do
-#         expect(subject.list_shard_spaces).to eq shard_spaces
-#       end
-#     end
-
-#     describe "GET #shard_space_info" do
-#       context "non-empty list" do
-#         it "returns shard space info" do
-#           expect(subject.shard_space_info('foo', 'default')).to eq shard_spaces.first
-#         end
-#       end
-
-#       context "returns an empty list" do
-#         let(:shard_spaces) { [] }
-
-#         it "returns no shard space" do
-#           expect(subject.shard_space_info('foo', 'default')).to be_nil
-#         end
-#       end
-#     end
-#   end
-
-#   describe "POST #create_shard_space" do
-#     let(:url) { "http://influxdb.test:9999/cluster/shard_spaces/foo" }
-#     let(:req_body) { subject.default_shard_space_options }
-#     let(:response) { { status: 200 } }
-
-#     before { stub_request(:post, url).with(request_params).to_return(response) }
-
-#     it 'returns OK' do
-#       expect(subject.create_shard_space("foo", subject.default_shard_space_options))
-#         .to be_a(Net::HTTPOK)
-#     end
-#   end
-
-#   describe "DELETE #delete_shard_space" do
-#     let(:url) { "http://influxdb.test:9999/cluster/shard_spaces/foo/default" }
-#     let(:response) { { status: 200 } }
-#     before { stub_request(:delete, url).with(request_params).to_return(response) }
-
-#     it 'returns OK' do
-#       expect(subject.delete_shard_space("foo", "default")).to be_a(Net::HTTPOK)
-#     end
-#   end
-
-#   describe "#update_shard_space" do
-#     let(:post_url) { "http://influxdb.test:9999/cluster/shard_spaces/foo/default" }
-#     let(:post_request_params) do
-#       {
-#         query: req_query,
-#         body:  subject.default_shard_space_options.merge("shardDuration" => "30d")
-#       }
-#     end
-
-#     it 'gets the shard space and updates the shard space' do
-#       stub_request(:get, url).with(request_params).to_return(response)
-#       stub_request(:post, post_url).with(post_request_params)
-
-#       expect(subject.update_shard_space("foo", "default", "shardDuration" => "30d")).to be_a(Net::HTTPOK)
-#     end
-#   end
-
-#   describe "POST #configure_database" do
-#     let(:url) { "http://influxdb.test:9999/cluster/database_configs/foo" }
-#     let(:req_body) { subject.default_database_configuration }
-
-#     before { stub_request(:post, url).with(request_params) }
-
-#     it "returns OK" do
-#       expect(subject.configure_database("foo")).to be_a(Net::HTTPOK)
-#     end
-#   end
-# end