Merge pull request #2469 from fluent/event-time-to_time

time: Add EventTime#to_time for faster Time creation
fluent · Jun 21, 2019 · a0240f6 · a0240f6
2 parents 910ec4c + 8c2aa63
commit a0240f6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/lib/fluent/time.rb b/lib/fluent/time.rb
@@ -69,6 +69,19 @@ def to_s
       @sec.to_s
     end
 
+    begin
+      # ruby 2.5 or later
+      Time.at(0, 0, :nanosecond)
+
+      def to_time
+        Time.at(@sec, @nsec, :nanosecond)
+      end
+    rescue
+      def to_time
+        Time.at(@sec, @nsec / 1000.0)
+      end
+    end
+
     def to_json(*args)
       @sec.to_s
     end

diff --git a/test/test_event_time.rb b/test/test_event_time.rb
@@ -36,6 +36,19 @@ class EventTimeTest < Test::Unit::TestCase
     assert_equal('100', "#{time}")
   end
 
+  test '#to_time' do
+    time = Fluent::EventTime.new(@now.to_i, @now.nsec).to_time
+    assert_instance_of(Time, time)
+    assert_equal(@now.to_i, time.to_i)
+    begin
+      ::Time.at(0, 0, :nanosecond)
+      assert_equal(@now.nsec, time.nsec)
+    rescue
+      # Time.at(@sec, @nsec / 1000.0) sometimes cause 1 diff error in nsec by 1000.0
+      assert_in_delta(@now.nsec, time.nsec, 1)
+    end
+  end
+
   test '#to_json' do
     time = Fluent::EventTime.new(100)
     assert_equal('100', time.to_json)