athena-utils 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f60738b7ecb0c8155fbdf4f85e0bc0371905840808af83eace67328b9a65177b
-  data.tar.gz: 8055dfa958fe0e4a3d8d7364a75e7a6ee500ea32316677472c80c20525c47d82
+  metadata.gz: 90313673159e89c11d9e5a349cf25ba6f36c8a1b2e0842aede4077b4bd4591e2
+  data.tar.gz: cc06774cad38266f57b842dbd75c05f82b2a39502c4c4918653f1a8becd8e8f0
 SHA512:
-  metadata.gz: aeccd09b1b52e06d5c4f7da44ae6b0538f2c779e959d22a2aa3b117709da72c463d409fa640af51208f1e5fc8fecb2cb8e891a45868f4ac9131f01202fbe5b24
-  data.tar.gz: 9485169a4b35602f55b7cf60321cc4629a2798b7380f6ec3d8edf4045c03debe20c362f520136fbd858726d65af15c1bf6b4c04cba16473c8dda4d39c6d1d7ce
+  metadata.gz: a9d081001c9d3df09e9c168eaf1b9ae3b9efef68304de3f7bee46f58faac5ba661cdcab389a1c41930c92673f6bce55f1b123e39fbc258789c62ffbfd7607ab9
+  data.tar.gz: c95477b1c4a8f13c6e3ad9433c0ebe123b56b4446799c70bf7c345c1e4a447742ca246dba2a6a015711e576a7018d679dc5b19145df5b2b178860ce2ab1054fa

data/athena-utils.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'athena-utils'
-  s.version     = '0.1.1'
+  s.version     = '0.2.0'
   s.licenses    = ['MIT']
   s.summary     = 'Athena Utils'
   s.description = 'Tools for querying AWS Athena'

data/bin/athena

@@ -5,9 +5,10 @@ require 'optparse'
 
 options = {
   database: nil,
-  output_location: nil,
+  work_group: 'primary',
   query: nil,
-  save: nil
+  save: nil,
+  console: false
 }
 OptionParser.new do |opts|
   opts.banner = "Usage: athena [options]"
@@ -16,8 +17,8 @@ OptionParser.new do |opts|
     options[:database] = v
   end
 
-  opts.on("-o", "--output-location OUTPUT_LOCATION", "S3 output location for athena queries") do |v|
-    options[:output_location] = v
+  opts.on("-w WORK_GROUP", "Athena Work Group, default: primary") do |v|
+    options[:work_group] = v
   end
 
   opts.on("-e", "--execute QUERY", "Execute SQL Query") do |v|
@@ -27,12 +28,16 @@ OptionParser.new do |opts|
   opts.on('-s', '--save FILE', 'Save query results to file') do |v|
     options[:save] = v
   end
+
+  opts.on('-c', '--console', 'Execute query and makes results available in irb') do
+    options[:console] = true
+  end
 end.parse!
 
 raise('must specify a database') unless options[:database]
-raise('must specify output location for athean queries') unless options[:output_location]
+raise('must specify work group for athean queries') unless options[:work_group]
 
-@athena = AthenaUtils::AthenaClient.new(options[:database], options[:output_location])
+@athena = AthenaUtils::AthenaClient.new(options[:database], options[:work_group])
 def athena
   @athena
 end
@@ -47,8 +52,17 @@ if options[:query]
     results.save(options[:save])
     exit
   end
-end
-
-require 'irb'
-IRB.start
 
+  if options[:console]
+    require 'irb'
+    IRB.start
+  else
+    io = results.s3_object.body
+    while chunk = io.read(8192)
+      print chunk
+    end
+  end
+else
+  require 'irb'
+  IRB.start
+end

data/lib/athena_utils/athena_client.rb

@@ -5,9 +5,9 @@ module AthenaUtils
     DEFAULT_WAIT_TIME = 3 # seconds
 
     # database is the name of the Athena DB
-    # output_location is the full S3 path to store the results of Athena queries
+    # work_group is Athena Work Group to use with queries
     attr_reader :database,
-                :output_location
+                :work_group
 
     # wait_time is time to wait before checking query results again
     attr_accessor :wait_time
@@ -15,9 +15,9 @@ module AthenaUtils
     attr_writer :aws_athena_client,
                 :aws_s3_client
 
-    def initialize(database, output_location, wait_time = DEFAULT_WAIT_TIME)
+    def initialize(database, work_group, wait_time = DEFAULT_WAIT_TIME)
       @database = database
-      @output_location = output_location
+      @work_group = work_group
       @wait_time = wait_time
     end
 
@@ -48,9 +48,7 @@ module AthenaUtils
         query_execution_context: {
           database: database
         },
-        result_configuration: {
-          output_location: output_location
-        }
+        work_group: work_group
       )
 
       response.query_execution_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: athena-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Doug Youch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-athena