drill-sergeant 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeb08242b5c896d36dd67b9af8c14d7eaa989643898939d9b6d6c81e03a4c578
-  data.tar.gz: a35e5e3b79f54a896490bab937c05ee0018175887d9659a466d2bc24bb9ee75f
+  metadata.gz: a9a45ee9fd9196539d55c04641748ea43915edc39b2de7a57acc066ec829a493
+  data.tar.gz: d38d61d15324267e96a19d93284cece7fdf37a035dccdc5eb7f3a73e0872c9fa
 SHA512:
-  metadata.gz: e9a459e815fe4abe80b8b8057f58f6e324011a9391b4dc50ace0522bcdac387e0712125419e787d7c1d59d0dc72a4e0a485b5d6ed4bd6a05c2a3619be06fc18d
-  data.tar.gz: 5ba841223a2be425a9b414c7ee0ffb52e60fdcc891d82f07aa3d1db317ab621ba8e1928a9ef299f7833786728c94bb0f4ee1e41e68c9f1a19dae8461a5bf7035
+  metadata.gz: 7bd8f5dc9e71be3bb905f092794ea5d91effae2dd80420f11d998382d5cee12d2945b856d06ae1f8248f27b7fbae4261a5280a72d53ea6c5501c479bdd538799
+  data.tar.gz: f4fc88b864649e84dbb3115e15703897bd24e50f0eefc9c956b4163fbe6da8bb4c20a89f5008b06a915ad611f0a5539c35ba1096d314305c6c1d19190471c043

data/CHANGELOG.md

@@ -1,16 +1,21 @@
-## 0.1.3
+## 0.1.4 (2022-01-16)
+
+- Added `server_version` method
+- Fixed error with failed queries with Drill 1.19+
+
+## 0.1.3 (2019-08-10)
 
 - Added more endpoints
 
-## 0.1.2
+## 0.1.2 (2018-07-22)
 
 - Added support for HTTPS
 - Added `open_timeout` and `read_timeout` options
 
-## 0.1.1
+## 0.1.1 (2017-03-24)
 
 - Return columns in correct order
 
-## 0.1.0
+## 0.1.0 (2017-03-24)
 
 - First release

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017-2019 Andrew Kane
+Copyright (c) 2017-2020 Andrew Kane
 
 MIT License
 

data/README.md

@@ -2,7 +2,7 @@
 
 Ruby client for Apache Drill
 
-[![Build Status](https://travis-ci.org/ankane/drill-sergeant.svg?branch=master)](https://travis-ci.org/ankane/drill-sergeant)
+[![Build Status](https://github.com/ankane/drill-sergeant/workflows/build/badge.svg?branch=master)](https://github.com/ankane/drill-sergeant/actions)
 
 ## Installation
 
@@ -16,7 +16,7 @@ drill-embedded
 And add this line to your application’s Gemfile:
 
 ```ruby
-gem 'drill-sergeant'
+gem "drill-sergeant"
 ```
 
 ## How to Use
@@ -99,3 +99,12 @@ Everyone is encouraged to help improve this project. Here are a few ways you can
 - Fix bugs and [submit pull requests](https://github.com/ankane/drill-sergeant/pulls)
 - Write, clarify, or fix documentation
 - Suggest or add new features
+
+To get started with development:
+
+```sh
+git clone https://github.com/ankane/drill-sergeant.git
+cd drill-sergeant
+bundle install
+bundle exec rake test
+```

data/lib/drill/version.rb

@@ -1,3 +1,3 @@
 class Drill
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/drill-sergeant.rb

@@ -6,6 +6,7 @@ require "net/http"
 # modules
 require "drill/version"
 
+# TODO make module and move to client
 class Drill
   class Error < StandardError; end
 
@@ -17,7 +18,7 @@ class Drill
   def initialize(url: nil, open_timeout: 3, read_timeout: nil)
     url ||= ENV["DRILL_URL"] || "http://localhost:8047"
     # remove trailing slash
-    @uri = URI.parse(url.sub(/\/\z/, ""))
+    @uri = URI.parse(url.chomp("/"))
     @http = Net::HTTP.new(@uri.host, @uri.port)
     @http.use_ssl = true if @uri.scheme == "https"
     @http.open_timeout = open_timeout if open_timeout
@@ -25,20 +26,11 @@ class Drill
   end
 
   def query(statement)
-    data = {
-      queryType: "sql",
-      query: statement
-    }
-
-    body = post("query.json", data)
-
-    # return columns in order
-    result = []
-    columns = body["columns"]
-    body["rows"].each do |row|
-      result << columns.each_with_object({}) { |c, memo| memo[c] = row[c] }
+    options = {}
+    if Gem::Version.new(server_version) >= Gem::Version.new("1.19.0")
+      options["drill.exec.http.rest.errors.verbose"] = true
     end
-    result
+    run_query(statement, options)
   end
 
   def profiles(query_id = nil)
@@ -64,8 +56,35 @@ class Drill
     get("options.json")
   end
 
+  def server_version
+    @server_version ||= run_query("SELECT version FROM sys.version", {})[0]["version"]
+  end
+
   private
 
+  def run_query(statement, options)
+    data = {
+      queryType: "sql",
+      query: statement,
+      options: options
+    }
+
+    body = post("query.json", data)
+
+    # errors return 200 with Drill 1.19+
+    if body["queryState"] != "COMPLETED"
+      raise Error, body["errorMessage"] || "Bad state: #{body["queryState"]}"
+    end
+
+    # return columns in order
+    result = []
+    columns = body["columns"]
+    body["rows"].each do |row|
+      result << columns.each_with_object({}) { |c, memo| memo[c] = row[c] }
+    end
+    result
+  end
+
   def get(path)
     handle_response do
       @http.get("#{@uri.request_uri}#{path}", HEADERS)
@@ -82,13 +101,13 @@ class Drill
     begin
       response = yield
     rescue Errno::ECONNREFUSED => e
-      raise Drill::Error, e.message
+      raise Error, e.message
     end
 
     unless response.kind_of?(Net::HTTPSuccess)
-      body = JSON.parse(response.body) rescue nil
+      body = JSON.parse(response.body) rescue {}
       message = body["errorMessage"] || "Bad response: #{response.code}"
-      raise Drill::Error, message
+      raise Error, message
     end
 
     JSON.parse(response.body)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drill-sergeant
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-10 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: andrew@chartkick.com
 executables: []
 extensions: []
@@ -67,7 +67,7 @@ homepage: https://github.com/ankane/drill-sergeant
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,8 +82,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Ruby client for Apache Drill
 test_files: []