fluent-plugin-pgjson 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a690b321412f2b0fe7dd2537e38c284b3d6753ee
+  data.tar.gz: abed844423a52e625fc1798231224df083b7e8ba
+SHA512:
+  metadata.gz: 933ee51523a63e67430316e12b0c22119d51d1e20a659e6b909bfdd63e8e6852c38f56cf85f6737b7f436e4915570617db6bcba9dc3e44a88962b669410b2e8a
+  data.tar.gz: 9f9b7c82bcc74e005b03abe6e98b6e496821407a4adbc8a9314702cc090ac373b93ec7b03bd2195d88f17db8bbefe60c9c3edb1e997d18f66ab0eed0d3929df2

data/README.md

@@ -1,4 +1,4 @@
-# Fluent::Plugin::PgJson
+# Fluent::Plugin::PgJson, a plugin for [Fluentd](http://fluentd.org)
 
 Output Plugin for PostgreSQL Json Type.
 

data/fluent-plugin-pgjson.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-pgjson"
-  s.version     = "0.0.4"
+  s.version     = "0.0.5"
   s.authors     = ["OKUNO Akihiro"]
   s.email       = ["choplin.choplin@gmail.com"]
   s.homepage    = "https://github.com/choplin/fluent-plugin-pgjson"

data/lib/fluent/plugin/out_pgjson.rb

@@ -13,6 +13,7 @@ class PgJsonOutput < Fluent::BufferedOutput
   config_param :time_col   , :string  , :default => 'time'
   config_param :tag_col    , :string  , :default => 'tag'
   config_param :record_col , :string  , :default => 'record'
+  config_param :messagepack, :bool  , :default => false
 
   def initialize
     super
@@ -22,7 +23,6 @@ class PgJsonOutput < Fluent::BufferedOutput
 
   def configure(conf)
     super
-    @stmt_name = 'insert'
   end
 
   def shutdown
@@ -40,56 +40,42 @@ class PgJsonOutput < Fluent::BufferedOutput
   def write(chunk)
     begin
       init_connection
-      sql = build_sql(chunk)
-      @conn.exec(sql)
-    rescue
-      begin
-        @conn.close()
-      rescue
+      @conn.exec("COPY #{@table} (#{@tag_col}, #{@time_col}, #{@record_col}) FROM STDIN WITH DELIMITER E'\\x01'")
+      chunk.msgpack_each do |tag, time, record|
+        @conn.put_copy_data "#{tag}\x01#{Time.at(time).to_s}\x01#{record_value(record)}\n"
       end
-
-      @conn = nil 
-      raise
+      @conn.put_copy_end
+    rescue
+      @conn.close()
+      @conn = nil
+      raise "failed to send data to postgres: #$!"
     end
   end
 
   private
   def init_connection
     if @conn.nil?
-      $log.debug "Connecting to PostgreSQL server #{@host}:#{@port}, database #{@database}..."
+      $log.debug "connecting to PostgreSQL server #{@host}:#{@port}, database #{@database}..."
 
       begin
         @conn = PGconn.new(:dbname => @database, :host => @host, :port => @port, :sslmode => @sslmode, :user => @user, :password => @password)
         @conn.setnonblocking(true)
       rescue
         if ! @conn.nil?
-          begin
-            @conn.close()
-          rescue
-          end
-
-          @conn - nil
+          @conn.close()
+          @conn = nil
         end
-
-        raise
+        raise "failed to initialize connection: #$!"
       end
     end
   end
 
-  def build_sql(chunk)
-    values = build_values(chunk)
-    sql =<<"SQL"
-INSERT INTO #{@table} (#{@tag_col}, #{@time_col}, #{@record_col})
-VALUES #{values};
-SQL
-  end
-
-  def build_values(chunk)
-    tmp = []
-    chunk.msgpack_each do |tag, time, record|
-      tmp << ("("+[tag, Time.at(time), record.to_json].map{|s| @conn.escape_literal(s.to_s)}.join(',')+")")
+  def record_value(record)
+    if @msgpack
+      "\\#{@conn.escape_bytea(record.to_msgpack)}"
+    else
+      record.to_json
     end
-    tmp.join(',')
   end
 end
 

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-pgjson
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - OKUNO Akihiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -50,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -62,29 +57,27 @@ files:
 - test/plugin/test_out.rb
 homepage: https://github.com/choplin/fluent-plugin-pgjson
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files:
 - test/helper.rb
 - test/plugin/test_out.rb
-has_rdoc: