rbpig 0.1.1 → 0.1.2

data/bin/rbpig

@@ -12,10 +12,6 @@ OptionParser.new do |opts|
   opts.on("-c", "--conf HADOOP_CONF", "Use this hadoop cluster xml config file.") do |config|
     options.hadoop_config = config
   end
-
-  opts.on("-m", "--mata-conf HIVE_CONF", "Use this hive metastore xml config file.") do |config|
-    options.hive_config = config
-  end
   
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
@@ -23,4 +19,4 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-exec(RBPig.executable(:hadoop_config => options.hadoop_config, :hive_config => options.hive_config))
+exec(RBPig.executable(:hadoop_config => options.hadoop_config))

data/lib/rbpig.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'rexml/document'
-require File.join(File.dirname(__FILE__), "rbpig", "dataset")
 
 module RBPig
   class << self
@@ -25,25 +24,20 @@ module RBPig
     
     private
     def pig_configs(configs)
-      {:hadoop_config => nil, :hive_config => nil}.merge(configs || {})
+      {:hadoop_config => nil}.merge(configs || {})
     end
     
     def pig_classpath(configs)
       classpath = [
         "#{File.join(File.dirname(__FILE__), %w[.. java dist porkchop.jar])}",
-        "#{File.join(File.dirname(__FILE__), %w[.. java lib hive hive-exec-0.5.0+32.jar])}",
-        "#{File.join(File.dirname(__FILE__), %w[.. java lib hive hive-metastore-0.5.0+32.jar])}",
-        "#{File.join(File.dirname(__FILE__), %w[.. java lib hive libfb303.jar])}",
-        "#{File.join(File.dirname(__FILE__), %w[.. java lib hive jdo2-api-2.3-SNAPSHOT.jar])}",
-        "#{File.join(File.dirname(__FILE__), %w[.. java lib hive datanucleus-core-1.1.2-patched.jar])}",
-        "#{File.join(File.dirname(__FILE__), %w[.. java lib hive datanucleus-enhancer-1.1.2.jar])}",
-        "#{File.join(File.dirname(__FILE__), %w[.. java lib hive datanucleus-rdbms-1.1.2.jar])}",
-        "#{File.join(File.dirname(__FILE__), %w[.. java lib pig jsp-2.1-6.1.14.jar])}"
+        "#{File.join(File.dirname(__FILE__), %w[.. java lib hive hive-metastore-0.7.0-CDH3B4.jar])}",
+        "#{File.join(File.dirname(__FILE__), %w[.. java lib hive thrift-0.5.0.jar])}",
+        "#{File.join(File.dirname(__FILE__), %w[.. java lib hive thrift-fb303-0.5.0.jar])}",
+        "#{File.join(File.dirname(__FILE__), %w[.. java lib jsp-2.1.jar])}",
+        "#{File.join(File.dirname(__FILE__), %w[.. java lib log4j-1.2.16.jar])}",
+        "#{File.join(File.dirname(__FILE__), %w[.. java lib slf4j-api-1.6.1.jar])}",
+        "#{File.join(File.dirname(__FILE__), %w[.. java lib slf4j-log4j12-1.6.1.jar])}"
       ]
-      unless configs[:hive_config].nil?
-        raise "Rename '#{configs[:hive_config]}' to hive-site.xml for hive metastore configuration." unless File.basename(configs[:hive_config]) == "hive-site.xml"
-        classpath << File.dirname(configs[:hive_config])
-      end
       classpath.join(":").freeze
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jae Lee
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 +00:00
+date: 2011-03-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,16 +43,14 @@ extra_rdoc_files: []
 files: 
 - bin/rbpig
 - lib/rbpig.rb
-- lib/rbpig/dataset.rb
 - java/dist/porkchop.jar
-- java/lib/hive/hive-exec-0.5.0+32.jar
-- java/lib/hive/hive-metastore-0.5.0+32.jar
-- java/lib/hive/libfb303.jar
-- java/lib/hive/jdo2-api-2.3-SNAPSHOT.jar
-- java/lib/hive/datanucleus-core-1.1.2-patched.jar
-- java/lib/hive/datanucleus-enhancer-1.1.2.jar
-- java/lib/hive/datanucleus-rdbms-1.1.2.jar
-- java/lib/pig/jsp-2.1-6.1.14.jar
+- java/lib/hive/hive-metastore-0.7.0-CDH3B4.jar
+- java/lib/hive/thrift-0.5.0.jar
+- java/lib/hive/thrift-fb303-0.5.0.jar
+- java/lib/jsp-2.1.jar
+- java/lib/log4j-1.2.16.jar
+- java/lib/slf4j-api-1.6.1.jar
+- java/lib/slf4j-log4j12-1.6.1.jar
 has_rdoc: true
 homepage: https://github.com/forward/rbpig
 licenses: []

data/lib/rbpig/dataset.rb

@@ -1,23 +0,0 @@
-module RBPig
-  class Dataset
-    class << self
-      HIVE_CONFIG = {:database => "default", :database_root => "/user/hive/warehouse"}
-      
-      def hive(table_name, storage_type = :text_file, config = {})
-        raise "storage type other than :text_file is not supported." unless storage_type == :text_file
-        
-        config = HIVE_CONFIG.merge(:field_separator => "\\t").merge(config)
-        new("#{table_name} = LOAD '#{config[:database_root]}/#{table_name}' USING HiveTableLoader('#{config[:field_separator]}', '#{config[:database]}');")
-      end
-    end
-    
-    def to_s
-      @load_script
-    end
-    
-    private
-    def initialize(load_script)
-      @load_script = load_script
-    end
-  end
-end