activerecord-hbase-adapter 0.0.71 → 0.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d20cfbf09998f3be62222929739135c35bcfe1b7
-  data.tar.gz: 5262a6b3e72274fdabb48b0fdb51a9e4acc8d445
+  metadata.gz: 78e884a73503282cda54f49a0bf77a7ededca706
+  data.tar.gz: dd61912a721ace8f23fbc75ed473c212db0a4488
 SHA512:
-  metadata.gz: 4d54be906d76ad9e6a51653f0425f250015a20fa8eefa7b08cb6b9b3714f893fb8250040c5baae48abec0f37a46f81ce351f16f71d8f266a418ac263a374225f
-  data.tar.gz: d9002bcd7755455128d4f714af265a1105b6c2485cc26143f5bcb91b8c0a076cd539e1fae51cca60371ab01b77a19f8e524c5834c57822282d231524422e83a4
+  metadata.gz: c145ade2cb4534191d4e6948eaae4755db849545ba78bca47b902c39f1d82cd82710f2748049a872d78e580afce158f966b8bfaa3b65c514a99d53ad5d04007a
+  data.tar.gz: c9afa8ebf276b1abe0328ed3b6ca678e5761722902687e7efe210286eb095ffae4ec3d16e8f6e069eb65434d602d92bafe38010e9d1f00a02208d2556c082ef1

data/activerecord-hbase-adapter.gemspec

@@ -10,9 +10,11 @@ Gem::Specification.new do |gem|
 
   gem.files         = [ 'Gemfile',
                         'activerecord-hbase-adapter.gemspec',
+                        'lib/activerecord-hbase-adapter.rb',
                         'lib/activerecord-hbase-adapter/version.rb',
                         'lib/active_record/connection_adapters/hbase_adapter.rb',
                         'lib/active_record/connection_adapters/abstract_mysql_adapter.rb',
+                        'lib/active_record/connection_adapters/hbase/time.rb',
                         'lib/active_record/connection_adapters/hbase/error.rb',
                         'lib/active_record/connection_adapters/hbase/result.rb',
                         'lib/active_record/connection_adapters/hbase/client.rb']

data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -304,7 +304,7 @@ module ActiveRecord
         #result = @connection.query('SELECT `mythings`.* FROM `mythings`')
         result = @connection.query(sql)
         File.open('/tmp/thing.txt', 'a') { |file| file.write("\n#{result.inspect}") }
-        #binding.pry
+        #binding.pry if sql == "SHOW FULL FIELDS FROM `schema_migrations`"
         #puts $the_e.inspect
         log(sql, name) { result }
       end

data/lib/active_record/connection_adapters/hbase/client.rb

@@ -26,16 +26,15 @@ module HbaseRestIface
     end
     
     def query(sql)
-      #File.open('/tmp/thing.txt', 'a') { |file| file.write("\n\n!!!query\n#{sql}") }
+      File.open('/tmp/thing.txt', 'a') { |file| file.write("\n!!query\n#{sql}") }
       query_object = HipsterSqlToHbase.parse_hash(sql)
-      #File.open('/tmp/thing.txt', 'a') { |file| file.write("\n#{query_object.inspect}") }
+      File.open('/tmp/thing.txt', 'a') { |file| file.write("\n#{query_object.inspect}") }
       begin
-        #TODO: make these be msgpack instead of json
-        result = secure_request("/exec", { body: {query: JSON.generate(query_object)} })
-        Hbase::Result.new(result)
-      rescue Exception => e  
-        #File.open('/tmp/thing.txt', 'a') { |file| file.write("\n\n!!!error\n#{e.message}") }
-        Hbase::Result.new()
+        result = secure_request("/exec", { body: {query: MessagePack.pack(query_object)} })
+        Hbase::Result.new(result) unless result.nil?
+      rescue Exception => e
+        File.open('/tmp/thing.txt', 'a') { |file| file.write("\n\n!!!error\n#{e.message}") }
+        nil
       end
     end
     
@@ -57,8 +56,7 @@ module HbaseRestIface
       end
       
       if response.code.to_s =~ /2\d\d/
-        #TODO: make these be msgpack instead of json
-        JSON.parse(response.body)
+        MessagePack.unpack(response.body)
       else
         error = Nokogiri::HTML(response.body)
         #binding.pry
@@ -74,8 +72,7 @@ module HbaseRestIface
       end
       
       if response.code.to_s =~ /2\d\d/
-        #TODO: make these be msgpack instead of json
-        JSON.parse(response.body)
+        MessagePack.unpack(response.body)
       else
         error = Nokogiri::HTML(response.body)
         #binding.pry

data/lib/active_record/connection_adapters/hbase/result.rb

@@ -5,6 +5,13 @@ module Hbase
     include Enumerable
     
     attr_accessor :members
+    
+    ### Keeping this just in case, for now
+    # def self.new(result = {'fields' => [], 'results' => []})
+    #   return nil if result['fields'].length < 1 && result['results'].length < 1
+    #   
+    #   super
+    # end
   
     def initialize(result = {'fields' => [], 'results' => []})
       @result = result

data/lib/active_record/connection_adapters/hbase/time.rb

@@ -0,0 +1,7 @@
+require 'msgpack'
+
+class Time
+  def to_msgpack(packer)
+    packer.pack self.to_s
+  end
+end

data/lib/active_record/connection_adapters/hbase_adapter.rb

@@ -1,11 +1,12 @@
 require 'active_record/connection_adapters/abstract_mysql_adapter'
+require 'active_record/connection_adapters/hbase/time'
 require 'active_record/connection_adapters/hbase/error'
 require 'active_record/connection_adapters/hbase/result'
 require 'active_record/connection_adapters/hbase/client'
 
 ### FOR DEBUGGING ONLY ###
-#$LOAD_PATH.unshift '/home/jean/adapter/lib/mysql2/lib'
-#require 'mysql2'
+$LOAD_PATH.unshift '/home/jean/adapter/lib/mysql2/lib'
+require 'mysql2'
 ### FOR DEBUGGING ONLY ###
 
 require 'hipster_sql_to_hbase'
@@ -18,16 +19,19 @@ module ActiveRecord
 
       config[:username] = 'root' if config[:username].nil?
       
-      ### FOR DEBUGGING ONLY ###
-      #if Mysql2::Client.const_defined? :FOUND_ROWS
-      #  config[:flags] = Mysql2::Client::FOUND_ROWS
-      #end
-      #config[:host] = config[:m2host]
-      #config[:port] = config[:m2port]
-      #client = Mysql2::Client.new(config)
-      ### FOR DEBUGGING ONLY ###
+      if !config[:m2debug].nil?
+        ### FOR DEBUGGING ONLY ###
+        if Mysql2::Client.const_defined? :FOUND_ROWS
+          config[:flags] = Mysql2::Client::FOUND_ROWS
+        end
+        config[:host] = config[:m2host]
+        config[:port] = config[:m2port]
+        client = Mysql2::Client.new(config)
+        ### FOR DEBUGGING ONLY ###
+      else
+        client = HbaseRestIface::Client.new(config)
+      end
       
-      client = HbaseRestIface::Client.new(config)
       options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
       ConnectionAdapters::HbaseAdapter.new(client, logger, options, config)
     rescue Hbase::Error => error

data/lib/activerecord-hbase-adapter.rb

@@ -0,0 +1,9 @@
+require 'activerecord-hbase-adapter/version'
+require 'active_record/connection_adapters/hbase_adapter'
+
+module Activerecord
+  module Hbase
+    module Adapter
+    end
+  end
+end

data/lib/activerecord-hbase-adapter/version.rb

@@ -1,7 +1,7 @@
 module Activerecord
   module Hbase
     module Adapter
-      VERSION = "0.0.71"
+      VERSION = "0.0.81"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hbase-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.71
+  version: 0.0.81
 platform: ruby
 authors:
 - Jean Lescure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipster_sql_to_hbase
@@ -79,7 +79,9 @@ files:
 - lib/active_record/connection_adapters/hbase/client.rb
 - lib/active_record/connection_adapters/hbase/error.rb
 - lib/active_record/connection_adapters/hbase/result.rb
+- lib/active_record/connection_adapters/hbase/time.rb
 - lib/active_record/connection_adapters/hbase_adapter.rb
+- lib/activerecord-hbase-adapter.rb
 - lib/activerecord-hbase-adapter/version.rb
 homepage: http://github.com/jeanlescure/activerecord-hbase-adapter
 licenses: []