fluent-plugin-ilm_hbase 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7196bc7b6d0b83505d43c17b24faeecfd0ce6b7
-  data.tar.gz: bed4db35b2f619fb5efa09aa74f83ff24b1644b1
+  metadata.gz: f19171bee111d1750ff276142aef2c4e36abe435
+  data.tar.gz: 19939bd172473245c2de7d8efff4748f092ebb4a
 SHA512:
-  metadata.gz: db4027c78077da4bfd6a134dd3c5d982af6a6c769278bd9f17da3e3bfcb6bf7cfbe48e27423f9323d1890bd83e1b693aee00f768cf0144efca68f3ec63b551ec
-  data.tar.gz: 993cd81551652459a22200667160f519188730a766cc076e978c6d1be00a8fe1d92db84d1a616d55e98941e91715c3265bb5984ee6440611a06775c6fdf46465
+  metadata.gz: 67109ee1d0550e0a99922437969f2069a2795156b43a13323f86d45f13670816201926fb39f597fa48020815de3df4fa9a03d23f2f3310b0a825efd852ad1fb5
+  data.tar.gz: 636f4992faed72f2dbd4b661053df52673abe6af6eb95896f2238c6dfc31d28eb410691a72f51abe953b45a8d0391084d4b6f447257e528ab9baed610db76309

data/lib/fluent/plugin/out_ilm_hbase.rb

@@ -20,8 +20,8 @@ module Fluent
     config_set_default :time_key, nil
 
 
-    config_param :include_custom_timestamp, :bool, :default=>false
-    config_param :custom_time_stamp_key, :string, :default => nil
+    config_param :include_custom_row_key, :bool, :default=>false
+    config_param :custom_key_list, :string, :default => nil
     config_param :tag_column_name, :string, :default => nil
     config_param :time_column_name, :string, :default => nil
     config_param :fields_to_columns_mapping, :string
@@ -35,8 +35,8 @@ module Fluent
         src_to_dst.split("=>")
       }
       @mapping = Hash[*@fields_to_columns.flatten]
-      @rowchangeflag = @include_custom_timestamp
-      @timekey = @custom_time_stamp_key
+      @rowchangeflag = @include_custom_row_key
+      @rowkeys = @custom_key_list.split(",")
       @customrow = SecureRandom.uuid
     end
 
@@ -94,17 +94,20 @@ MESSAGE
     end
 
     def write(chunk)
-        if @rowchangeflag
+        row_key = ""
+	row_attrs = Array.new
+	if @rowchangeflag
         chunk.msgpack_each {|row_values|
-        row_values.each {|column_family_and_column, value|
-          if column_family_and_column == @custom_time_stamp_key
-                @customrow = value
-          end
-
-        }
-
-        }
-      end
+        
+	row_attrs << row_values.select do |column_family_and_column, value| 
+		rowkeys.include? column_family_and_column
+	end.map do |column_family_and_column, value| value end
+	        
+      }
+	head, *tail = row_attrs
+	row_key << head
+	tail.each do |value| row_key << "-"; row_key << value; end
+	end
       chunk.msgpack_each {|row_values|
         event = {}
 
@@ -115,7 +118,7 @@ MESSAGE
         }
 
         row = MassiveRecord::Wrapper::Row.new
-        row.id = @customrow
+        row.id = row_key
         row.values = event
         row.table = @table
         row.save

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ilm_hbase
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - testman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler