fluent-plugin-cassandra-json 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c364b934b9fb53c16a262267d5e02b1066c79f556bb66f1b2b8efec97a9e79d7
-  data.tar.gz: f19d96c2ae49cb1dee50c5501255fba0ed7b5831af8355ad4991cbe69f517504
+  metadata.gz: 8f0a54cd332017c0ef51daa42703420d01cc81163a08c65bfc265c1672fea7d4
+  data.tar.gz: e74da50b90ac352caba817515223a17dea06eeac53011aa433c261a5e2160e9d
 SHA512:
-  metadata.gz: 81a10a01729f9427ccd5bcb0163ba307d3e2278070475cf8e87ad4b26ce0d2bcc05e280df9f1da358a623e0bd753ded06a58e177ece25000b45f5017e19bdb7c
-  data.tar.gz: 61cda410a57bf545a84fbcfc9ea2785452f62e6ea27f566b3a7f465e977676de6cc363ae792f925f080cda8bafe4d2d629c6b7d40a7950d4b4a89bada5235f34
+  metadata.gz: a1e5f642dc19ae1811f9f556a39e941fa4754e19bc7ac127a9dba64bab4abd285df56448b5b311c23bbec647ee0ff488d22acff81205728ac391c6e4431e9aca
+  data.tar.gz: d46fd63678806d8f7f194fc7044403142dd5954c70b8b4f459f41430efe7b822fae3e571b94626ce038618cfee54a3c5f40d6662eebad63ebd958b0d6f0a194b

data/fluent-plugin-cassandra-json.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-cassandra-json"
-  spec.version = "0.1.1"
+  spec.version = "0.1.2"
   spec.authors = ["joker1007"]
   spec.email   = ["kakyoin.hierophant@gmail.com"]
 

data/lib/fluent/plugin/out_cassandra_json.rb

@@ -69,7 +69,7 @@ module Fluent
         @cluster_options.merge!(username: @username) if @username
         @cluster_options.merge!(password: @password) if @password
         formatter_config = conf.elements("format")[0]
-        @formatter = formatter_create(usage: 'out_bigquery_for_insert', type: 'json', conf: formatter_config)
+        @formatter = formatter_create(usage: 'out_cassandra_for_insert', type: 'json', conf: formatter_config)
       end
 
       def start
@@ -106,7 +106,7 @@ module Fluent
         futures = chunk.open do |io|
           io.map do |line|
             line.chomp!
-            cql = "INSERT INTO #{keyspace}.#{table} JSON '#{line}'"
+            cql = "INSERT INTO #{keyspace}.#{table} JSON '#{line.gsub("'", "''")}'"
             cql << " IF NOT EXISTS" if @if_not_exists
             cql << " USING TTL #{@ttl}" if @ttl && @ttl > 0
             @log.debug(cql)

data/test/plugin/test_out_cassandra_json.rb

@@ -41,7 +41,110 @@ class CassandraJsonOutputTest < Test::Unit::TestCase
     assert { result.size == 1 }
 
     first = result.each.to_a[0]
-    assert { first == data.tap { |d| d["col6"] = Set.new(%w(one two three)) } }
+    expected = data.dup
+    expected["col6"] = Set.new(data["col6"])
+    assert { first["id"] == expected["id"] }
+    (1..7).each do |i|
+      assert { first["col#{i}"] == expected["col#{i}"] }
+    end
+  end
+
+  test "quoted data" do
+    driver = create_driver
+    time = Time.local(2018, 5, 8, 14, 10, 5)
+    data = {
+      "id" => 1,
+      "col1" => "text'data",
+      "col2" => time,
+      "col3" => true,
+      "col4" => 1.23,
+      "col5" => [1, 2, 3],
+      "col6" => ["one", "t\"wo", "th'r''ee"],
+      "col7" => {"key1" => "val1", "key2" => "val2"},
+    }
+    invalid_data = data.merge("id" => "invalid")
+    driver.run do
+      driver.feed("tag", Time.now.to_i, data)
+      driver.feed("tag", Time.now.to_i, data)
+      driver.feed("tag", Time.now.to_i, invalid_data)
+    end
+    result = @session.execute("SELECT * FROM test_keyspace.test_table")
+    assert { result.size == 1 }
+
+    first = result.each.to_a[0]
+    data["col6"] = Set.new(data["col6"])
+    assert { first["id"] == data["id"] }
+    (1..7).each do |i|
+      assert { first["col#{i}"] == data["col#{i}"] }
+    end
+  end
+
+  test "write data (if not exist)" do
+    conf = %[
+      hosts #{ENV.fetch("CASSANDRA_HOST", "127.0.0.1")}
+      port #{ENV.fetch("CASSANDRA_PORT", "9042")}
+      keyspace test_keyspace
+      table test_table
+      if_not_exists true
+    ]
+    driver = create_driver(conf)
+    time = Time.local(2018, 5, 8, 14, 10, 5)
+    data = {
+      "id" => 1,
+      "col1" => "textdata",
+      "col2" => time,
+      "col3" => true,
+      "col4" => 1.23,
+      "col5" => [1, 2, 3],
+      "col6" => ["one", "two", "three"],
+      "col7" => {"key1" => "val1", "key2" => "val2"},
+    }
+    driver.run do
+      driver.feed("tag", Time.now.to_i, data)
+    end
+    result = @session.execute("SELECT * FROM test_keyspace.test_table")
+    assert { result.size == 1 }
+
+    first = result.each.to_a[0]
+    data["col6"] = Set.new(data["col6"])
+    assert { first["id"] == data["id"] }
+    (1..7).each do |i|
+      assert { first["col#{i}"] == data["col#{i}"] }
+    end
+  end
+
+  test "write data (ttl)" do
+    conf = %[
+      hosts #{ENV.fetch("CASSANDRA_HOST", "127.0.0.1")}
+      port #{ENV.fetch("CASSANDRA_PORT", "9042")}
+      keyspace test_keyspace
+      table test_table
+      ttl 30
+    ]
+    driver = create_driver(conf)
+    time = Time.local(2018, 5, 8, 14, 10, 5)
+    data = {
+      "id" => 1,
+      "col1" => "textdata",
+      "col2" => time,
+      "col3" => true,
+      "col4" => 1.23,
+      "col5" => [1, 2, 3],
+      "col6" => ["one", "two", "three"],
+      "col7" => {"key1" => "val1", "key2" => "val2"},
+    }
+    driver.run do
+      driver.feed("tag", Time.now.to_i, data)
+    end
+    result = @session.execute("SELECT * FROM test_keyspace.test_table")
+    assert { result.size == 1 }
+
+    first = result.each.to_a[0]
+    data["col6"] = Set.new(data["col6"])
+    assert { first["id"] == data["id"] }
+    (1..7).each do |i|
+      assert { first["col#{i}"] == data["col#{i}"] }
+    end
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cassandra-json
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler