embulk-output-bigobject 0.3.4 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e98e4ee288205d9e18ac9c3c4f22f29d01fcec5b
-  data.tar.gz: b3f2aba9a693ae919281242ba1cd5f17fd5d1808
+  metadata.gz: 4a1f4e9350156b99f2607618762c641c774cd573
+  data.tar.gz: cfeb2e35a4d6d3ead4d5c4cd910e578e65f57f7a
 SHA512:
-  metadata.gz: d1a08ac922777f9b2efb49695224eca2e7549c5efcc107caec26fcd484f7279f733559689bf261c7cf44aed1f58fd70201807adccceadce9cf4fd91b83cf47c4
-  data.tar.gz: b9f2004fbe397d06235b63f7633e6637dc46482c1d4868a484cc1aa3d7c8cc0faa98a4f5822871c9c76a032bb00605e60e667a5e110d9b5f1df6ff56bc7ddf83
+  metadata.gz: 8423a4ac35e7ba3843cfd2da2ff7b0255390b78d3596e19e71565c496359ffdd4d814c734314a541b4550e4793e15ceba9468fc613e5fb6b04d96172c81811dd
+  data.tar.gz: 1374988497f7158f5c4f07aa159a91be58834c64c04521e74795f48acd8d57903b14a7ce53b27574d52b43a093e963bc8c705405f7445abdb256d05f0f50035d

data/embulk-output-bigobject.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-output-bigobject"
-  spec.version       = "0.3.4"
+  spec.version       = "0.4.4"
   spec.authors       = ["Cheng-Ching Huang"]
   spec.summary       = "Bigobject output plugin for Embulk"
   spec.description   = "Dumps records to Bigobject."

data/lib/embulk/output/bigobject.rb

@@ -17,6 +17,7 @@ module Embulk
           "restport"       => config.param("restport",       :integer, :default => 9090),  # integer, optional
           "ncport"         => config.param("ncport",         :integer, :default => 9091),  # integer, optional
           "table"          => config.param("table",          :string),        # string, required
+		  "rowcolumn"	   => config.param("rowcolumn",      :string,  :default => "ROW"), # string, optional
 		  "column_options" => config.param("column_options", :array,   :default => []),   
           "payload_column_index" => config.param("payload_column_index", :integer,  :default => nil),   
         }
@@ -45,7 +46,7 @@ module Embulk
         if response["Status"] == 0 then # the table exists
           Embulk.logger.debug { "#{response}" }
         elsif response["Status"] == -11 then # the table does not exist
-          response = rest_exec(task['rest_uri'], "#{create_botable_stmt("#{task['table']}",schema, task["column_options"])}")
+          response = rest_exec(task['rest_uri'], "#{create_botable_stmt("#{task['table']}", "#{task['rowcolumn']}", schema, task["column_options"])}")
           if response["Status"] != 0 then 
             Embulk.logger.error { "#{response}" }
             raise "Create table #{task['table']} in BigObject Failed"
@@ -97,29 +98,23 @@ module Embulk
       def close
       end
 
-      def add_csv(page)
-        data = Array.new
-        
-        page.each do |record|
-          values = []
-          record.each do |row| values << "\"#{row.to_s.gsub(/\"/,"\"\"")}\"" end
-		  data.push "#{values.join(",")}\n"
-        end
-
-		safe_io_write "#{data.join}"
-
-        @counter += data.length
-        @task['ttl_counter'] += data.length
-
-      end
-
-      def add_payload(page)
+      def add(page)
         data = Array.new
 		pindex = @task['payload_column_index']
+		Embulk.logger.debug "#{pindex}"
 
-        page.each do |record|
-		  data.push "#{record[pindex]}\n"
-        end
+		if pindex
+		  page.each do |record|
+		    data.push "#{record[pindex]}\n"
+			Embulk.logger.debug "#{record[pindex]}\n"
+		  end
+		else
+          page.each do |record|
+            values = []
+            record.each do |row| values << "\"#{row.to_s.gsub(/\"/,"\"\"")}\"" end
+		    data.push "#{values.join(",")}\n"
+          end
+		end
 
 		safe_io_write "#{data.join}"
 
@@ -128,14 +123,6 @@ module Embulk
 
       end
 
-	  def add(page)
-		  if (@task['payload_column_index'])
-		  	add_payload(page)
-		  else
-		  	add_csv(page)
-		  end
-	  end
-
       def finish
       end
 
@@ -168,7 +155,7 @@ module Embulk
         end
       end
 
-      def self.create_botable_stmt(tbl,schema, cos)
+      def self.create_botable_stmt(tbl,rowcol,schema, cos)
 		val_array = Array.new
 		schema.each do |c|
 		  co = cos[c.index] || {}
@@ -176,16 +163,16 @@ module Embulk
 		  val_array.push "#{co["name"] || c.name} #{to_bigobject_column_type(c.type.to_s, c.format.to_s, co)}" 
 		end
 	    bo_table_schema = val_array.join(',')
-		Embulk.logger.debug {"schema (#{schema.class}): #{schema}"}
-		Embulk.logger.debug {"schema: #{bo_table_schema}"}
+		#Embulk.logger.debug {"schema (#{schema.class}): #{schema}"}
+		#Embulk.logger.debug {"schema: #{bo_table_schema}"}
 		keys = Array.new
 		cos.each do |co|
 		  keys.push co["name"] if co["is_key"] 
 		end
 		if keys.length == 0
-          "CREATE TABLE #{tbl} (#{bo_table_schema})"
+          "CREATE TABLE #{tbl} #{rowcol} (#{bo_table_schema})"
 		else
-          "CREATE TABLE #{tbl} (#{bo_table_schema} KEY(#{keys.join(',')}))"
+          "CREATE TABLE #{tbl} #{rowcol} (#{bo_table_schema} KEY(#{keys.join(',')}))"
 		end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-bigobject
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.4
 platform: ruby
 authors:
 - Cheng-Ching Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client