queuery_client 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a5b41cb805e7fc0864fd695adc519c6b7212c294383935af40301d88b5b8d63
-  data.tar.gz: d4e970371d23e36bf40d4cafdf9e7da0d886c25bb0882ce9e12fc2a971a0e2c0
+  metadata.gz: 4a1006fdef0ce698e6d38c02fcbeaab4ef928a7be704395d57da8ae963b94301
+  data.tar.gz: 70b2fc77eeb6ed27047db209f3aa89cd4a0b5c83fb4616535134e8d14ce537f6
 SHA512:
-  metadata.gz: f61f86445e64fca2863ba474a6cfb27e87af761516b3fbb5394adbe6f61e23e4f9d81778cded02dc512bf495bb8b711099962b5fd63154880bcc3e746bf25f61
-  data.tar.gz: ee0f09b1e92729056857117a7fdf4fa422d13bae5168f521e6d2cd8ca8adc2152334c59fd826aff916369ee8db811c792a49087ddd08dfdb283c0a31445bab78
+  metadata.gz: 7a0338752a52c4f67f94823139bbc78b736a24c143176e5a521c832c2dcb23bda57b3c18adfa0deacc9ab5e52e3dc43728d26db3b790b6bf5dbe64c809f0f9ff
+  data.tar.gz: 6f8c7c248f55ba26763e7ff90d2f52c42c9d3776bf690440dd9f3aeda1b22c3f76c109fbe705ead7fc65f03c27a4e7257f0ed2b8976e2e5f27ebafc5ac09fbae

data/lib/queuery_client/client.rb

@@ -14,14 +14,23 @@ module QueueryClient
       garage_client.get("/v1/queries/#{id}", fields: '__default__,s3_prefix' + query_option_fields)
     end
 
+    MAX_POLLING_INTERVAL = 30
+
     def wait_for(id, query_options)
+      n = 1
       loop do
-        query = get_query(id, query_options)
-        case query.status
-        when 'success', 'failed'
-          return query
+        begin
+          query = get_query(id, query_options)
+          case query.status
+          when 'success', 'failed'
+            return query
+          end
+        rescue GarageClient::GatewayTimeout
+          warn "#{$PROGRAM_NAME}: warning: queuery polling timeout occurred"
         end
-        sleep 3
+        polling_interval = [3 * n, MAX_POLLING_INTERVAL].min
+        sleep polling_interval
+        n += 1
       end
     end
 

data/lib/queuery_client/redshift_data_type.rb

@@ -1,6 +1,17 @@
 
 module QueueryClient
   module RedshiftDataType
+    FALSE_VALUES = [
+      false, 0,
+      "0", :"0",
+      "f", :f,
+      "F", :F,
+      "false", :false,
+      "FALSE", :FALSE,
+      "off", :off,
+      "OFF", :OFF,
+    ].to_set.freeze
+
     def self.type_cast(row, manifest_file)
       row.zip(manifest_file.column_types).map do |value, type|
         next nil if (value == '' and type != 'character varing') # null becomes '' on unload
@@ -13,11 +24,11 @@ module QueueryClient
         when 'character', 'character varying'
           value
         when 'timestamp without time zone', 'timestamp with time zone'
-          Time.parse(value)
+          value # Ruby does not have a class without timezone
         when 'date'
           Date.parse(value)
         when 'boolean'
-          value == 'true' ? true : false
+          FALSE_VALUES.include?(value) ? false : true
         else
           raise "not support data type: #{type}"
         end

data/lib/queuery_client/s3_data_file_bundle.rb

@@ -23,13 +23,19 @@ module QueueryClient
 
     def data_files
       b = Aws::S3::Resource.new(client: @s3_client).bucket(@bucket)
-      b.objects(prefix: @prefix).map {|obj| S3DataFile.new(obj) }
+      b.objects(prefix: @prefix)
+        .select {|obj| obj.key.include?('_part_') }
+        .map {|obj| S3DataFile.new(obj) }
     end
 
     def manifest_file
       b = Aws::S3::Resource.new(client: @s3_client).bucket(@bucket)
       obj = b.object("#{@prefix}manifest")
-      S3ManifestFile.new(obj)
+      if obj.exists?
+        S3ManifestFile.new(obj)
+      else
+        nil
+      end
     end
 
     def has_manifest?

data/lib/queuery_client/version.rb

@@ -1,3 +1,3 @@
 module QueueryClient
-  VERSION = "1.1.0"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: queuery_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - Hidekazu Kobayashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: garage_client