hexspace 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22ba7e18e6dec1e5c97403f0fc8ce08580309f750058137576c51208da225ee4
-  data.tar.gz: 3cc3bd22042aac858407961d5ef71eaa820f6c96381442b694f2cc8e9808f318
+  metadata.gz: b01d38959d851e6e96d16a2230b62e6f659089f855307959a4c27585c32a6550
+  data.tar.gz: 5515be12059303b0e6ee12222caf04896ec8c79b23ffe519b8e9f213f957e257
 SHA512:
-  metadata.gz: e158652968097ceb7590d26a6523a43525316991a60e122e02d911959938652864442ade94d751ba834eb43b09311ad7da243b7995e7e27be8e2b7277d85b887
-  data.tar.gz: 22b6218778f4b8b62575ab2da576da126671867033a0c35e8963147f84ac000b77910699b30923c10236e335217382543176f8fe1201db281d556ca47a7145f4
+  metadata.gz: 7cbfb5be0c692cae31a82b7fc9a817ea443b13549ad92d73ac3d40db371b3ecdba0cc2f7f73dec9407043d5938f00519e6cdc40f990cb9b1cd1c82e544c44e54
+  data.tar.gz: 43fd8714dd9126d3a51246ed7f500a4da7640f2d72c039ea511dfccbd0799bb4103492eccf87ed03ea4dae09eb64c79b20a797e25d84c248596b47319a85f3d8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.1 (2023-11-12)
+
+- Added `result_object` option
+
 ## 0.2.0 (2023-05-07)
 
 - Fixed error with Spark 3.4.0

data/README.md

@@ -46,6 +46,24 @@ Supported modes are `:sasl`, `:nosasl`, `:http`, and `:https`. Please create an
 
 The timeout is in seconds and only applies to `:sasl` and `:nosasl`.
 
+## Query Options
+
+Set a timeout
+
+```ruby
+client.execute(statement, timeout: 10)
+```
+
+Get a `Hexspace::Result` object instead of an array of hashes
+
+```ruby
+result = client.execute(statement, result_object: true)
+result.rows
+result.columns
+result.column_types
+result.to_a
+```
+
 ## Spark SQL Setup
 
 Download [Apache Spark](https://spark.apache.org/downloads.html) and start the [Thift server](https://spark.apache.org/docs/latest/sql-distributed-sql-engine.html).

data/lib/hexspace/client.rb

@@ -48,12 +48,12 @@ module Hexspace
       ObjectSpace.define_finalizer(self, self.class.finalize(@transport, @client, @session))
     end
 
-    # TODO add new method that returns Result object
-    # so its possible to get duplicate columns
-    # as well as columns when there are no rows
-    def execute(statement, timeout: nil)
+    def execute(statement, timeout: nil, result_object: false)
       result = execute_statement(statement, timeout: timeout)
-      process_result(result) if result.operationHandle.hasResultSet
+      if result.operationHandle.hasResultSet
+        result = process_result(result)
+        result_object ? result : result.to_a
+      end
     end
 
     # private
@@ -113,7 +113,7 @@ module Hexspace
           if j == 0
             new_rows = value.values.size
             new_rows.times do
-              rows << {}
+              rows << []
             end
           end
 
@@ -130,17 +130,17 @@ module Hexspace
           #   end
           when "date"
             values.each do |v|
-              rows[offset][name] = nulls[offset] == "1" ? nil : Date.parse(v)
+              rows[offset][j] = nulls[offset] == "1" ? nil : Date.parse(v)
               offset += 1
             end
           when "decimal"
             values.each do |v|
-              rows[offset][name] = nulls[offset] == "1" ? nil : BigDecimal(v)
+              rows[offset][j] = nulls[offset] == "1" ? nil : BigDecimal(v)
               offset += 1
             end
           else
             values.each do |v|
-              rows[offset][name] = nulls[offset] == "1" ? nil : v
+              rows[offset][j] = nulls[offset] == "1" ? nil : v
               offset += 1
             end
           end
@@ -153,7 +153,7 @@ module Hexspace
       req.operationHandle = stmt.operationHandle
       check_status client.CloseOperation(req)
 
-      rows
+      Result.new(rows, columns, types)
     end
   end
 end

data/lib/hexspace/result.rb

@@ -0,0 +1,17 @@
+module Hexspace
+  class Result
+    attr_reader :rows, :columns, :column_types
+
+    def initialize(rows, columns, column_types)
+      @rows = rows
+      @columns = columns
+      @column_types = column_types
+    end
+
+    def to_a
+      @rows.map do |row|
+        @columns.zip(row).to_h
+      end
+    end
+  end
+end

data/lib/hexspace/version.rb

@@ -1,3 +1,3 @@
 module Hexspace
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/hexspace.rb

@@ -12,6 +12,7 @@ require_relative "hexspace/tcli_service"
 
 # modules
 require_relative "hexspace/client"
+require_relative "hexspace/result"
 require_relative "hexspace/sasl_transport"
 require_relative "hexspace/version"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexspace
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
@@ -35,6 +35,7 @@ files:
 - README.md
 - lib/hexspace.rb
 - lib/hexspace/client.rb
+- lib/hexspace/result.rb
 - lib/hexspace/sasl_transport.rb
 - lib/hexspace/tcli_service.rb
 - lib/hexspace/tcli_service_constants.rb