logstash-input-jdbc 4.3.3 → 4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e6e0b7edc864e0dbf118ae0914cf9e90a206adbc5355553f939f25a743249a4
-  data.tar.gz: e0591ca8fd7abbe2fe50d8612f16d2c752c8b57dbf578ca042d029b4b06bad73
+  metadata.gz: 4182f11b49a8109b280f7c078b547a71b3c7134dc54834b06705f94ba064d216
+  data.tar.gz: 6decb981a1ce99e9aac59da1b0259968db299e348d16c76a83cac07e87a58fa8
 SHA512:
-  metadata.gz: 2fe8cb1056311e63dd228ea4b2939d4395ee8abe8a23b938d56ebc31bf71cea958482fa6abc159ac64282e604eb33ef28f31bf75918552f1c4cc226de7e8b85f
-  data.tar.gz: cbf609402167ea1bd6e4d5ec3ec9a1cfd6eb0135989046395645bc3eb99347832931a9f432c7f6c7e3d03639e69565a4cc143086e6c635162957972cb442dcbd
+  metadata.gz: 8d9cb81fe24f6f301166f2f8baeaa90f18e43f4d3d7ef0ff9c09516d9edd57a5bf6e4eaa9d3a112af7616b062b39f781384dbc25ee3ef9a20fbc1594e36612ca
+  data.tar.gz: e2b979fdfc781cda71aaa0aa1232f9c25b21e120f89ec07729e3bb41e68a57cd7d6d8c467a6db79bf66a83d2f9f29209d2ed76877fe1595af0ee6e2190649152

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.3.4
+  - [#261](https://github.com/logstash-plugins/logstash-input-jdbc/issues/261) Fix memory leak.
+  
 ## 4.3.3
   - [#255](https://github.com/logstash-plugins/logstash-input-jdbc/issues/255) Fix thread and memory leak.
   

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/logstash/plugin_mixins/jdbc.rb

@@ -103,7 +103,8 @@ module LogStash::PluginMixins::Jdbc
     opts = {
       :user => @jdbc_user,
       :password => @jdbc_password.nil? ? nil : @jdbc_password.value,
-      :pool_timeout => @jdbc_pool_timeout
+      :pool_timeout => @jdbc_pool_timeout,
+      :keep_reference => false
     }.merge(@sequel_opts)
     retry_attempts = @connection_retry_attempts
     loop do
@@ -232,24 +233,12 @@ module LogStash::PluginMixins::Jdbc
         @tracking_column_warning_sent = false
         @logger.debug? and @logger.debug("Executing JDBC query", :statement => statement, :parameters => parameters, :count => query.count)
 
-        if @jdbc_paging_enabled
-          query.each_page(@jdbc_page_size) do |paged_dataset|
-            paged_dataset.each do |row|
-              sql_last_value = get_column_value(row) if @use_column_value
-              if @tracking_column_type=="timestamp" and @use_column_value and sql_last_value.is_a?(DateTime)
-                sql_last_value=Time.parse(sql_last_value.to_s) # Coerce the timestamp to a `Time`
-              end
-              yield extract_values_from(row)
-            end
-          end
-        else
-          query.each do |row|
-            sql_last_value = get_column_value(row) if @use_column_value
-            if @tracking_column_type=="timestamp" and @use_column_value and sql_last_value.is_a?(DateTime)
-              sql_last_value=Time.parse(sql_last_value.to_s) # Coerce the timestamp to a `Time`
-            end
-            yield extract_values_from(row)
+        perform_query(query) do |row|
+          sql_last_value = get_column_value(row) if @use_column_value
+          if @tracking_column_type=="timestamp" and @use_column_value and sql_last_value.is_a?(DateTime)
+            sql_last_value = sql_last_value.to_time # Coerce the timestamp to a `Time`
           end
+          yield extract_values_from(row)
         end
         success = true
       rescue Sequel::DatabaseConnectionError, Sequel::DatabaseError => e
@@ -263,6 +252,24 @@ module LogStash::PluginMixins::Jdbc
       return success
   end
 
+  # Performs the query, respecting our pagination settings, yielding once per row of data
+  # @param query [Sequel::Dataset]
+  # @yieldparam row [Hash{Symbol=>Object}]
+  private
+  def perform_query(query)
+    if @jdbc_paging_enabled
+      query.each_page(@jdbc_page_size) do |paged_dataset|
+        paged_dataset.each do |row|
+          yield row
+        end
+      end
+    else
+      query.each do |row|
+        yield row
+      end
+    end
+  end
+
   public
   def get_column_value(row)
     if !row.has_key?(@tracking_column.to_sym)

data/logstash-input-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-jdbc'
-  s.version         = '4.3.3'
+  s.version         = '4.3.4'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Creates events from JDBC data"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.3.4
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement