avro 1.11.3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 124c809b0bcf3463852b754fb01cf2b75e4d90547a934d8932a27f52a3264b69
-  data.tar.gz: e293185ed5b05dd1aaf6837dc9a64748cd0d26fbba8ab5fc0a4b608cca7ab244
+  metadata.gz: 494daaa5f42901a0ae52f6fe0b723c3c0f0ec2d951e425c76cdc3998c7f7d2af
+  data.tar.gz: 04d5c0c5eba948dfde59ea0c5d328de0926df053e9d9d04a8dd61bc6f1982a1f
 SHA512:
-  metadata.gz: 677e4fc7525cea9ac5309b891bb88b60c2421ee58add86d90efa3fa0731199b6cbb2f0bb2b7db42c9237f54a36fb5dda49de649fb5d40810d73f1c7084d9e290
-  data.tar.gz: e0bcfcd4f139ad961ae0af5ecac5eba24d6cfaab866487bd8c06918158d7e0f8307b33fc550cd35c2a75cc93fa75851c038a85a2f27f8eed123bf16219d07105
+  metadata.gz: 2f52c72d63ce36d92ac83625b951422be2aea73889f8de13e4d40cc87af8c56a717484d6d55f71979d2acd1680f967c4d65b908e9f68bc25f850aa0ebac204db
+  data.tar.gz: a839620ed610140111c47de1ad050f75c35ed036221165cb3b1fae30556b8e41be86db073fd59fe788f4b346ed41efbff21c81cc4ad2a8caa136a40b9a04cec7

data/avro.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.description = "Avro is a data serialization and RPC format"
   s.homepage = "https://avro.apache.org/"
   s.license = "Apache-2.0"
-  s.required_ruby_version = ">= 2.6"
+  s.required_ruby_version = ">= 2.7"
 
   s.metadata["homepage_uri"] = s.homepage
   s.metadata["bug_tracker_uri"] = "https://issues.apache.org/jira/browse/AVRO"

data/lib/avro/VERSION.txt

@@ -1 +1 @@
-1.11.3
+1.12.0

data/lib/avro/io.rb

@@ -75,7 +75,7 @@ module Avro
       def read_float
         # A float is written as 4 bytes.
         # The float is converted into a 32-bit integer using a method
-        # equivalent to Java's floatToIntBits and then encoded in
+        # equivalent to Java's floatToRawIntBits and then encoded in
         # little-endian format.
         read_and_unpack(4, 'e')
       end
@@ -83,7 +83,7 @@ module Avro
       def read_double
         #  A double is written as 8 bytes.
         # The double is converted into a 64-bit integer using a method
-        # equivalent to Java's doubleToLongBits and then encoded in
+        # equivalent to Java's doubleToRawLongBits and then encoded in
         # little-endian format.
         read_and_unpack(8, 'E')
       end
@@ -203,7 +203,7 @@ module Avro
 
       # A float is written as 4 bytes.
       # The float is converted into a 32-bit integer using a method
-      # equivalent to Java's floatToIntBits and then encoded in
+      # equivalent to Java's floatToRawIntBits and then encoded in
       # little-endian format.
       def write_float(datum)
         @writer.write([datum].pack('e'))
@@ -211,7 +211,7 @@ module Avro
 
       # A double is written as 8 bytes.
       # The double is converted into a 64-bit integer using a method
-      # equivalent to Java's doubleToLongBits and then encoded in
+      # equivalent to Java's doubleToRawLongBits and then encoded in
       # little-endian format.
       def write_double(datum)
         @writer.write([datum].pack('E'))

data/lib/avro/logical_types.rb

@@ -214,30 +214,50 @@ module Avro
     end
 
     module TimestampMillis
+      SUBUNITS_PER_SECOND = 1000
+
       def self.encode(value)
         return value.to_i if value.is_a?(Numeric)
 
         time = value.to_time
-        time.to_i * 1000 + time.usec / 1000
+        time.to_i * SUBUNITS_PER_SECOND + time.usec / SUBUNITS_PER_SECOND
       end
 
       def self.decode(int)
-        s, ms = int / 1000, int % 1000
-        Time.at(s, ms * 1000).utc
+        s, ms = int.divmod(SUBUNITS_PER_SECOND)
+        Time.at(s, ms, :millisecond).utc
       end
     end
 
     module TimestampMicros
+      SUBUNITS_PER_SECOND = 1000_000
+
+      def self.encode(value)
+        return value.to_i if value.is_a?(Numeric)
+
+        time = value.to_time
+        time.to_i * SUBUNITS_PER_SECOND + time.usec
+      end
+
+      def self.decode(int)
+        s, us = int.divmod(SUBUNITS_PER_SECOND)
+        Time.at(s, us, :microsecond).utc
+      end
+    end
+
+    module TimestampNanos
+      SUBUNITS_PER_SECOND = 1000_000_000
+
       def self.encode(value)
         return value.to_i if value.is_a?(Numeric)
 
         time = value.to_time
-        time.to_i * 1000_000 + time.usec
+        time.to_i * SUBUNITS_PER_SECOND + time.nsec
       end
 
       def self.decode(int)
-        s, us = int / 1000_000, int % 1000_000
-        Time.at(s, us).utc
+        s, ns = int.divmod(SUBUNITS_PER_SECOND)
+        Time.at(s, ns, :nanosecond).utc
       end
     end
 
@@ -260,7 +280,8 @@ module Avro
       },
       "long" => {
         "timestamp-millis" => TimestampMillis,
-        "timestamp-micros" => TimestampMicros
+        "timestamp-micros" => TimestampMicros,
+        "timestamp-nanos"  => TimestampNanos
       },
     }.freeze
 

data/test/random_data.rb

@@ -89,6 +89,8 @@ class RandomData
       Avro::LogicalTypes::TimestampMicros.decode(rand_long)
     when 'timestamp-millis'
       Avro::LogicalTypes::TimestampMillis.decode(rand_long)
+    when 'timestamp-nanos'
+      Avro::LogicalTypes::TimestampNanos.decode(rand_long)
     end
   end
 

data/test/test_io.rb

@@ -94,7 +94,10 @@ EOS
                             "logicalType": "timestamp-micros"}},
                   {"name": "ts2",
                    "type": {"type": "long",
-                            "logicalType": "timestamp-millis"}}]}
+                            "logicalType": "timestamp-millis"}},
+                  {"name": "ts3",
+                   "type": {"type": "long",
+                            "logicalType": "timestamp-nanos"}}]}
 EOS
     check(record_schema)
   end

data/test/test_logical_types.rb

@@ -92,6 +92,28 @@ class TestLogicalTypes < Test::Unit::TestCase
     assert_equal Time.utc(2015, 5, 28, 21, 46, 53, 221843), type.decode(1432849613221843)
   end
 
+  def test_timestamp_nanos_long
+    schema = Avro::Schema.parse <<-SCHEMA
+      { "type": "long", "logicalType": "timestamp-nanos" }
+    SCHEMA
+
+    time = Time.at(628232400, 123456789, :nanosecond)
+    assert_equal 'timestamp-nanos', schema.logical_type
+    assert_encode_and_decode time, schema
+    assert_preencoded Avro::LogicalTypes::TimestampNanos.encode(time), schema, time.utc
+  end
+
+  def test_timestamp_nanos_long_conversion
+    type = Avro::LogicalTypes::TimestampNanos
+
+    now = Time.now.utc
+
+    assert_equal Time.at(now.to_i, now.nsec, :nanosecond).utc, type.decode(type.encode(now))
+    assert_equal 1432849613221843789, type.encode(Time.at(1432849613, 221843789, :nanosecond).utc)
+    assert_equal 1432849613221843789, type.encode(DateTime.new(2015, 5, 28, 21, 46, 53.221843789))
+    assert_equal Time.at(1432849613, 221843789, :nanosecond).utc, type.decode(1432849613221843789)
+  end
+
   def test_parse_fixed_duration
     schema = Avro::Schema.parse <<-SCHEMA
       { "type": "fixed", "size": 12, "name": "fixed_dur", "logicalType": "duration" }
@@ -141,7 +163,7 @@ class TestLogicalTypes < Test::Unit::TestCase
                     "null"
                 ],
                 "default": "\u0000"
-            }  
+            }
         ]
     }')
 
@@ -215,7 +237,7 @@ class TestLogicalTypes < Test::Unit::TestCase
     sales_tax_record = {
       "sales" => BigDecimal("12.34"),
       "tax" => BigDecimal("0.000"),
-      "invoice_date" => Time.at(0).to_date,
+      "invoice_date" => Date.new(1970, 1, 1),
       # time-millis is not supported
       "invoice_time" => 0,
       "created_at" => Time.at(0).utc,
@@ -316,7 +338,6 @@ class TestLogicalTypes < Test::Unit::TestCase
       end
 
       assert_equal 5, report.total_allocated
-      # Ruby 2.7 does not retain anything. Ruby 2.6 retains 1
       assert_operator 1, :>=, report.total_retained
     end
   end
@@ -337,8 +358,7 @@ class TestLogicalTypes < Test::Unit::TestCase
       end
 
       assert_equal 5, report.total_allocated
-      # Ruby 2.7 does not retain anything. Ruby 2.6 retains 1 or 2
-      assert_operator 2, :>=, report.total_retained
+      assert_equal 0, report.total_retained
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avro
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.12.0
 platform: ruby
 authors:
 - Apache Software Foundation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-15 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -72,7 +72,7 @@ metadata:
   homepage_uri: https://avro.apache.org/
   bug_tracker_uri: https://issues.apache.org/jira/browse/AVRO
   source_code_uri: https://github.com/apache/avro
-  documentation_uri: https://avro.apache.org/docs/1.11.3/
+  documentation_uri: https://avro.apache.org/docs/1.12.0/
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options:
@@ -85,14 +85,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Apache Avro for Ruby