sequel-hive-adapter 0.2.4 → 0.3.0

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem "sequel"
-gem "rbhive"
+gem "rbhive", "~>0.2.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -8,7 +8,7 @@ GEM
       git (>= 1.2.5)
       rake
     rake (0.8.7)
-    rbhive (0.1.17)
+    rbhive (0.2.5)
       thrift (>= 0.4.0)
     rcov (0.9.9)
     redgreen (1.2.2)
@@ -21,7 +21,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
     sequel (3.23.0)
-    thrift (0.6.0)
+    thrift (0.7.0)
     yard (0.6.8)
 
 PLATFORMS
@@ -30,7 +30,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.0)
-  rbhive
+  rbhive (~> 0.2.2)
   rcov
   redgreen
   rspec (~> 2.3.0)

data/README.rdoc

@@ -1,10 +1,12 @@
 = sequel-hive-adapter
 
-A Hadoop Hive adapter for Sequel. Uses rbhive and thrift.
+A Hadoop Hive adapter for Sequel. Uses rbhive[https://github.com/forward/rbhive] and thrift[http://thrift.apache.org/].
 
 = Installation
 
   gem install sequel-hive-adapter
+
+RubyGems.org: http://rubygems.org/gems/sequel-hive-adapter
   
 = Usage
 
@@ -20,7 +22,7 @@ Also from the command-line:
   Your database is stored in DB...
   > DB.tables
   Executing Hive Query: SHOW TABLES
-  => [["table1","table2",...]]
+  => [[:table1,:table2,...]]
 
 == Contributing to sequel-hive-adapter
  

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/lib/sequel/adapters/hive.rb

@@ -26,15 +26,23 @@ module Sequel
       end
       alias_method :do, :execute
       
+      #
+      # Returns the schema for the given table as an array with all members being arrays of length 2, 
+      # the first member being the column name, and the second member being a hash of column 
+      # information.
+      #
       def schema(table, opts={})
         hero = execute("DESCRIBE #{table}")
-        hero[2..-1].map do |h|
-          [h.first.strip.to_sym, {:db_type => h[1].strip.to_sym, :type => h[1].strip.to_sym}]
-        end.reject{|r| [:"", :col_name].include?(r.first) || r.first[/Partition Information/] }
+        hero.map do |h|
+          [ h[:col_name].to_sym, { :db_type => h[:data_type] , :comment => h[:comment] } ]
+        end
       end
 
+      #
+      # Returns a list of tables as symbols.
+      #
       def tables(opts={})
-        execute('SHOW TABLES')
+        execute('SHOW TABLES').map{|i| i.values}.reduce(:+).map{|i| i.to_sym}
       end
 
       private
@@ -47,46 +55,18 @@ module Sequel
     class Dataset < Sequel::Dataset
       SELECT_CLAUSE_METHODS = clause_methods(:select, %w'distinct columns from join where group having compounds order limit')
 
-      #TODO better type conversion
-      CONVERT_FROM = { :boolean => :to_s, :string => :to_s, :bigint => :to_i, :float => :to_f, :double => :to_f, :int => :to_i, :smallint => :to_i, :tinyint => :to_i }
-
       def schema
         @schema ||= @db.schema(@opts[:from].first)
       end
 
       def columns
-        return @columns if @columns
-        if needs_schema_check?
-          @columns = schema.map{|c| c.first.to_sym}
-        else
-          @columns = @opts[:select].map do |col|
-            col.respond_to?(:aliaz) ? col.aliaz : col
-          end
-        end
-      end
-
-      # Returns the function symbol that converts a column to the correct datatype
-      def convert_type(column)
-        return :to_s unless needs_schema_check?
-        db_type = schema.select do |a|
-          a.first == column
-        end.flatten!
-        CONVERT_FROM[db_type.last[:db_type]]
+        @columns ||= schema.map{|c| c.first.to_sym}
       end
 
       def fetch_rows(sql)
         execute(sql) do |result|
-          begin
-            width = result.first.size
-            result.each do |r|
-              row = {}
-              r.each_with_index do |v, i| 
-                row[columns[i]] = v.send(convert_type(columns[i]))
-              end
-              yield row
-            end
-          ensure
-            #  result.close
+          result.each do |r|
+            yield r
           end
         end
         self
@@ -94,10 +74,6 @@ module Sequel
 
       private
 
-      def needs_schema_check?
-        @opts[:select].nil? || @opts[:select].include?(:*)
-      end
-
       def select_clause_methods
         SELECT_CLAUSE_METHODS
       end

data/sequel-hive-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sequel-hive-adapter}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["hrp"]
-  s.date = %q{2011-05-19}
+  s.authors = [%q{hrp}]
+  s.date = %q{2011-08-20}
   s.description = %q{A Hadoop Hive adapter for Sequel. Uses RBHive and Thrift.}
   s.email = %q{hrparmar@gmail.com}
   s.extra_rdoc_files = [
@@ -31,9 +31,9 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/hrp/sequel-hive-adapter}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.8}
   s.summary = %q{Hive adapter for Sequel.}
 
   if s.respond_to? :specification_version then
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sequel>, [">= 0"])
-      s.add_runtime_dependency(%q<rbhive>, [">= 0"])
+      s.add_runtime_dependency(%q<rbhive>, ["~> 0.2.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<redgreen>, [">= 0"])
     else
       s.add_dependency(%q<sequel>, [">= 0"])
-      s.add_dependency(%q<rbhive>, [">= 0"])
+      s.add_dependency(%q<rbhive>, ["~> 0.2.2"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sequel>, [">= 0"])
-    s.add_dependency(%q<rbhive>, [">= 0"])
+    s.add_dependency(%q<rbhive>, ["~> 0.2.2"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/spec/sequel-hive-adapter_spec.rb

@@ -3,18 +3,46 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "SequelHiveAdapter" do
 
   before(:all) do
-    TEST_HOST = "localhost"
+    TEST_HOST = "172.16.87.131"  # CDH3 Demo VM
     @testdb = Sequel.connect("hive://#{TEST_HOST}")
-    @testtable = 'test_test_test'
+    @testtable = :test_test_test
+    @sampletable = :pokes
+    @sampledb = @testdb[ @sampletable ]
   end
 
   it "should load" do
     @testdb.should be_an_instance_of Sequel::Hive::Database
   end
 
-  it "should convert string columns to strings" do
+  pending "should create and drop tables" do
+    @testdb.create_table @testtable do
+      column :name, :string
+      column :num, :integer
+    end
   end
 
-  it "should handle group and count" do
+  it "should list tables as symbols" do
+    res = @testdb.tables
+    res.each do |r|
+      r.should be_a Symbol
+    end
+  end
+
+  it "should list table schemas" do
+  end
+
+  it "should list table columns" do
+    @sampledb.columns.should == [:foo, :bar]
+  end
+
+  it "should return the value for one column" do
+    @sampledb.select(:foo).first.should == {:foo => 5}
+  end
+  
+
+  pending "should convert string columns to strings" do
+  end
+
+  pending "should handle group and count" do
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: sequel-hive-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - hrp
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 Z
+date: 2011-08-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sequel
@@ -28,9 +28,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3532910496915418146
+      hash: -3353089072672527350
       segments: 
       - 0
       version: "0"
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Hive adapter for Sequel.