fluent-plugin-pghstore 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f54a1b343fc8ac9594d33367d1fa002037ae3cc
-  data.tar.gz: 97ee47a8101b4e163c81f2cfe8eef14981f201b0
+  metadata.gz: b3e04d208d0f647303315742d3a6b682334d143d
+  data.tar.gz: 6b0891e377cb9d1289479c4f4c247ebc7bad4438
 SHA512:
-  metadata.gz: 8173f766585f15570cf2f58b8de5ce08c72d9015e7d6d91123afbf230b7a77ad882a31ff602ab1c0006db9d79eb019e3aa4eddf7f2838375174b761b2a6ca92f
-  data.tar.gz: d8f007ddc5e9b931b51465c149a394f44047b6cc9771334f985dfa9a5a9a6a0fa65c49690296cdfcfe772d8444c8cc84faf4f4590bd26e9968cff09d5960e932
+  metadata.gz: dca3130b73a82f1f2c23583641735af81bac2a4f3079a6f3c568062148a0d796d0732f1497f81694b2142f0c11cfdd0fc9aedd2deb56436602de2dd7417c2203
+  data.tar.gz: da3be89d0beff7901de981ac2983afe4134c34fc38f90cf48df4edbe9788c2d7737797614a901a191cd7e396a6367267984c18f4a696f964c2fc76dd1f11e076

data/fluent-plugin-pghstore.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-pghstore"
-  s.version     = "0.2.6"
+  s.version     = "0.2.7"
   s.authors     = ["WAKAYAMA Shirou"]
   s.email       = ["shirou.faw@gmail.com"]
   s.homepage    = "https://github.com/shirou/fluent-plugin-pghstore"
@@ -21,8 +21,9 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec", "~> 3.2.0"
   # s.add_runtime_dependency "rest-client"
-  s.add_development_dependency "fluentd", "~> 0.12.5"
+  s.add_development_dependency "fluentd", [">= 0.12.5", "< 2"]
   s.add_development_dependency "pg", "~> 0.18.1"
+  s.add_development_dependency "rake", ">= 11.0"
   s.add_development_dependency "test-unit", "~> 3.1.0"
 #  s.add_runtime_dependency "fluentd", "~> 0.12.5"
 #  s.add_runtime_dependency "pg", "~> 0.18.1"

data/lib/fluent/plugin/out_pghstore.rb

@@ -13,6 +13,7 @@ class Fluent::PgHStoreOutput < Fluent::BufferedOutput
   def initialize
     super
     require 'pg'
+    @conn = nil
   end
 
   def start
@@ -28,7 +29,7 @@ class Fluent::PgHStoreOutput < Fluent::BufferedOutput
       conn.close()
     end
   end
-  
+
   def format(tag, time, record)
     [tag, time, record].to_msgpack
   end
@@ -41,7 +42,7 @@ class Fluent::PgHStoreOutput < Fluent::BufferedOutput
       sql = generate_sql(conn, tag, time_str, record)
       begin
         conn.exec(sql)
-      rescue PGError => e 
+      rescue PGError => e
         $log.error "PGError: " + e.message  # dropped if error
       end
     }
@@ -49,6 +50,18 @@ class Fluent::PgHStoreOutput < Fluent::BufferedOutput
     conn.close()
   end
 
+  # for tests.
+  def table_schema(tablename)
+    sql =<<"SQL"
+CREATE TABLE #{tablename} (
+  tag TEXT[],
+  time TIMESTAMP WITH TIME ZONE,
+  record HSTORE
+);
+SQL
+    sql
+  end
+
   private
 
   def generate_sql(conn, tag, time, record)
@@ -105,13 +118,7 @@ SQL
   end
 
   def create_table(tablename)
-    sql =<<"SQL"
-CREATE TABLE #{tablename} (
-  tag TEXT[],
-  time TIMESTAMP WITH TIME ZONE,
-  record HSTORE
-);
-SQL
+    sql = table_schema(tablename)
 
     sql += @table_option if @table_option
 
@@ -119,7 +126,7 @@ SQL
     raise "Could not connect the database at create_table. abort." if conn == nil
 
     begin
-      conn.exec(sql) 
+      conn.exec(sql)
     rescue PGError => e
       $log.error "Error at create_table:" + e.message
       $log.error "SQL:" + sql

data/test/plugin/test_out_pghstore.rb

@@ -5,11 +5,17 @@ class PGHStoreOutputTest < Test::Unit::TestCase
     Fluent::Test.setup
   end
 
+  HOST = "localhost"
+  PORT = 5432
+  DATABASE = "postgres"
+  TABLE = "testtable"
+  USER = ENV["PSQL_USER"] || "testuser"
+  PASSWORD = ENV["PSQL_PASSWORD"] || "testpassword"
   CONFIG = %[
-    database "testdb"
-    table "testtable"
-    user "testuser"
-    password "testpassword"
+    database #{DATABASE}
+    table #{TABLE}
+    user #{USER}
+    password #{PASSWORD}
   ]
 
   def create_driver(conf = CONFIG, tag='test.input')
@@ -17,28 +23,90 @@ class PGHStoreOutputTest < Test::Unit::TestCase
   end
 
   def test_configure
+    d = create_driver
+
+    assert_equal DATABASE, d.instance.database
+    assert_equal HOST, d.instance.host
+    assert_equal PORT, d.instance.port
+    assert_equal USER, d.instance.user
+    assert_equal PASSWORD, d.instance.password
   end
 
   def test_format
     d = create_driver
+    with_connection(d) do |_conn|
 
-    # time = Time.parse("2011-01-02 13:14:15 UTC").to_i
-    # d.emit({"a"=>1}, time)
-    # d.emit({"a"=>2}, time)
+      time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+      d.emit({"a"=>1}, time)
+      d.emit({"a"=>2}, time)
 
-    # d.expect_format %[2011-01-02T13:14:15Z\ttest\t{"a":1}\n]
-    # d.expect_format %[2011-01-02T13:14:15Z\ttest\t{"a":2}\n]
+      d.expect_format ['test.input', time, {"a"=>1}].to_msgpack
+      d.expect_format ['test.input', time, {"a"=>2}].to_msgpack
 
-    # d.run
+      d.run
+    end
   end
 
   def test_write
     d = create_driver
+    with_connection(d) do |conn|
+      time = Time.parse("2011-01-02 13:14:15 UTC").to_i
+      d.emit({"a"=>1}, time)
+      d.emit({"a"=>2}, time)
+      d.run
+
+      wait_data(conn)
+
+      res = conn.exec("select * from #{TABLE}")[0]
+      assert_equal "{test,input}", res["tag"]
+      assert_equal Time.at(time), Time.parse(res["time"])
+      assert_equal "\"a\"=>\"1\"", res["record"]
+    end
+  end
+
+  def ensure_connection
+    conn = nil
+    assert_nothing_raised do
+      conn = PGconn.new(:dbname => DATABASE, :host => HOST, :port => PORT, :user => USER, :password => PASSWORD)
+    end
+    conn
+  end
 
-    # time = Time.parse("2011-01-02 13:14:15 UTC").to_i
-    # d.emit({"a"=>1}, time)
-    # d.emit({"a"=>2}, time)
+  def with_connection(driver, &block)
+    conn = ensure_connection
+    register_hstore(conn) rescue nil # suppress Exception
+    create_test_table(driver, conn)
+    begin
+      block.call(conn)
+    ensure
+      drop_test_table(conn)
+      unregister_hstore(conn)
+      conn.close
+    end
+  end
 
+  def register_hstore(conn)
+    conn.exec("CREATE EXTENSION hstore;")
   end
 
+  def unregister_hstore(conn)
+    conn.exec("DROP EXTENSION hstore;")
+  end
+
+  def create_test_table(driver, conn)
+    conn.exec(driver.instance.table_schema("#{TABLE}"))
+  end
+
+  def drop_test_table(conn)
+    conn.exec("DROP TABLE #{TABLE}")
+  end
+
+  def wait_data(conn)
+    10.times do
+      res = conn.exec "select count(*) from #{TABLE}"
+      return if res.getvalue(0,0).to_i > 0
+      sleep 0.2
+    end
+    raise "Inserting records have not been finished correctly"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-pghstore
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - WAKAYAMA Shirou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -28,16 +28,22 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement