-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This PR laid down adaptations to run this plugin under JRuby 9.4 (Ruby 3.1) List of changes: - in a method with var args the hash map has to be defined when passed as argument, d19fc58 Ruby 3.0 - Ruby 3.1 comes with Psych 4 which switched the alias of load from unsafe_load to safe_load reference. Created a wrapper method to behave consistently across different versions of JRuby. - fixed a stubbing error in tests: 72a2af5 - covered ValueTracker with unit tests
- Loading branch information
Showing
6 changed files
with
144 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| # encoding: utf-8 | ||
| require "logstash/plugin_mixins/jdbc/value_tracking" | ||
| require "tempfile" | ||
|
|
||
| module LogStash module PluginMixins module Jdbc | ||
| describe ValueTracking do | ||
| context "#load_yaml" do | ||
|
|
||
| context "with date string" do | ||
| let(:yaml_date_source) { "--- !ruby/object:DateTime '2023-06-15 09:59:30.558000000 +02:00'\n" } | ||
|
|
||
| it "should be loaded" do | ||
| parsed_date = LogStash::PluginMixins::Jdbc::ValueTracking.load_yaml(yaml_date_source) | ||
| expect(parsed_date.class).to eq DateTime | ||
| expect(parsed_date.year).to eq 2023 | ||
| expect(parsed_date.month).to eq 6 | ||
| expect(parsed_date.day).to eq 15 | ||
| end | ||
| end | ||
|
|
||
| context "with time string" do | ||
| let(:yaml_time_source) { "--- 2023-06-15 15:28:15.227874000 +02:00\n" } | ||
|
|
||
| it "should be loaded" do | ||
| parsed_time = LogStash::PluginMixins::Jdbc::ValueTracking.load_yaml(yaml_time_source) | ||
| expect(parsed_time.class).to eq Time | ||
| expect(parsed_time.year).to eq 2023 | ||
| expect(parsed_time.month).to eq 6 | ||
| expect(parsed_time.day).to eq 15 | ||
| expect(parsed_time.hour).to eq 15 | ||
| expect(parsed_time.min).to eq 28 | ||
| expect(parsed_time.sec).to eq 15 | ||
| end | ||
| end | ||
|
|
||
| context "with date string" do | ||
| let(:yaml_bigdecimal_source) { "--- !ruby/object:BigDecimal '0:0.1e1'\n" } | ||
|
|
||
| it "should be loaded" do | ||
| parsed_bigdecimal = LogStash::PluginMixins::Jdbc::ValueTracking.load_yaml(yaml_bigdecimal_source) | ||
| expect(parsed_bigdecimal.class).to eq BigDecimal | ||
| expect(parsed_bigdecimal.to_i).to eq 1 | ||
| end | ||
| end | ||
| end | ||
|
|
||
| context "#build_last_value_tracker" do | ||
|
|
||
| let(:plugin) { double("fake plugin") } | ||
| let(:temp_file) { Tempfile.new('last_run_tracker') } | ||
|
|
||
| before(:each) do | ||
| allow(plugin).to receive(:record_last_run).and_return(true) | ||
| allow(plugin).to receive(:clean_run).and_return(false) | ||
| allow(plugin).to receive(:last_run_metadata_file_path).and_return(temp_file.path) | ||
| end | ||
|
|
||
| context "create numerical tracker" do | ||
| before(:each) do | ||
| allow(plugin).to receive(:use_column_value).and_return(true) | ||
| allow(plugin).to receive(:tracking_column_type).and_return("numeric") | ||
| end | ||
|
|
||
| it "should write correctly" do | ||
| tracker = ValueTracking.build_last_value_tracker(plugin) | ||
| tracker.set_value(1) | ||
| tracker.write | ||
|
|
||
| temp_file.rewind | ||
| v = ValueTracking.load_yaml(::File.read(temp_file.path)) | ||
| expect(v).to eq 1 | ||
| end | ||
| end | ||
|
|
||
| context "create date time tracker" do | ||
| before(:each) do | ||
| allow(plugin).to receive(:use_column_value).and_return(false) | ||
| allow(plugin).to receive(:jdbc_default_timezone).and_return(:something_not_nil) | ||
| end | ||
|
|
||
| it "should write correctly" do | ||
| tracker = ValueTracking.build_last_value_tracker(plugin) | ||
| tracker.set_value("2023-06-15T15:28:15+02:00") | ||
| tracker.write | ||
|
|
||
| temp_file.rewind | ||
| v = ValueTracking.load_yaml(::File.read(temp_file.path)) | ||
| expect(v.class).to eq DateTime | ||
| expect(v.year).to eq 2023 | ||
| end | ||
| end | ||
|
|
||
| context "create time tracker" do | ||
| before(:each) do | ||
| allow(plugin).to receive(:use_column_value).and_return(false) | ||
| allow(plugin).to receive(:jdbc_default_timezone).and_return(nil) | ||
| end | ||
|
|
||
| it "should write correctly" do | ||
| tracker = ValueTracking.build_last_value_tracker(plugin) | ||
| tracker.set_value("2023-06-15T15:28:15+02:00") | ||
| tracker.write | ||
|
|
||
| temp_file.rewind | ||
| v = ValueTracking.load_yaml(::File.read(temp_file.path)) | ||
| expect(v.class).to eq Time | ||
| expect(v.min).to eq 28 | ||
| end | ||
| end | ||
|
|
||
| end | ||
| end | ||
| end end end |