jrjackson 0.4.9-java → 0.4.10-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518b60237a4fb88e239f4423e47314a5fe4a09cdf0901415db7afad5a35b9a57
-  data.tar.gz: 0e08b62e3ad49c5babbe2a00da87ad8b54bab271a37de33b33c83882320cac68
+  metadata.gz: 8d3369b8782272fc87ef0644bb444d6b16af249d7a2857f748b87fb93a9f804b
+  data.tar.gz: 61b413b82ec56c365737e64a46fe972a028c056f2dee601facde6d1c9687aa40
 SHA512:
-  metadata.gz: 040d69f72e5f414bbddf870c3181bd6e41795b3d774df5524b0a9023a8905c7afc3dcb54d04a239ea4d56934270d9a40c5936929636cce3d7abd3144326ec411
-  data.tar.gz: 50f202d3f5236d76dac6b3eace958553ba4013055f98215411f7998730348a97d1c5902f6dcc6eadccd6fd52c39788e934952fe0f57cc29f39c294c554491fa0
+  metadata.gz: 212cd2f25cc3bef4256882fb48a9ca338e3d415afa034d71368508b5117a5d19435799018b875f4a9fd2bb18b0c0eeca38a0bf9acbbbd8ce3f24fe85dfb18057
+  data.tar.gz: 6c5399b0a071d9a6609c1ec188018bae58b4dd1656be1f6185237c363fdfd5978ef93e75bd58ce8c4fdee2e79718bd9c5c58b0fe9312e4cca0609d2864943061

data/Gemfile

@@ -5,6 +5,9 @@ group :development do
   gem 'gson', '>= 0.6'
   gem 'json', '~> 1.8'
   gem 'benchmark-ips'
+  gem 'jar-dependencies',  "=0.3.10"
+  gem 'ruby-maven'
+  gem 'rake'
 end
 
 gemspec

data/Rakefile

@@ -10,7 +10,7 @@ end
 
 desc "Run benchmarks"
 task :benchmark do
-  load 'benchmarking/benchmark.rb'
+  load 'benchmarking/benchmark_threaded.rb'
 end
 
 desc "Pack jar after compiling classes, use this to rebuild the pom.xml"

data/changelog.md

@@ -1,3 +1,11 @@
+v0.4.10
+  fix concurrency issue when serializing dates. 
+  Cache UTC TimeZone class to avoid unnecessary calls to synchronized method
+  Use a ThreadLocal to hold per-thread instances of SimpleDateFormat to avoid
+   unnecessary expensive clonings of that object
+  Replace unsafe call to setDateFormat on static ObjectMapper class by creating
+   an amended SerializationConfig
+
 v0.4.9
   bump Jackson to v2.9.9, and jackson-databind to v2.9.9.3
 

data/lib/jrjackson/build_info.rb

@@ -1,11 +1,11 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.4.9'
+      '0.4.10'
     end
 
     def self.release_date
-      '2019-08-09'
+      '2019-09-25'
     end
 
     def self.files
@@ -21,7 +21,7 @@ module JrJackson
     end
 
     def self.jar_version
-      '1.2.27'
+      '1.2.28'
     end
 
     private

data/src/main/java/com/jrjackson/RubyAnySerializer.java

@@ -234,13 +234,13 @@ public class RubyAnySerializer extends JsonSerializer<IRubyObject> {
         if (df == null) {
             // DateFormat should always be set
             provider.defaultSerializeDateValue(dt.getJavaDate(), jgen);
-        } else if (df instanceof RubyDateFormat) {
+        } // RWB Note: I believe this is no longer used
+        else if (df instanceof RubyDateFormat) {
             // why another branch? I thought there was an easy win on to_s
             // maybe with jruby 9000
-            RubyDateFormat rdf = (RubyDateFormat) df.clone();
-            jgen.writeString(rdf.format(dt.getJavaDate()));
+            RubyDateFormat clonedRubyDateFormat = (RubyDateFormat) df.clone();
+            jgen.writeString(clonedRubyDateFormat.format(dt.getJavaDate()));
         } else {
-            SimpleDateFormat sdf = (SimpleDateFormat) df.clone();
             jgen.writeString(df.format(dt.getJavaDate()));
         }
     }

data/src/main/java/com/jrjackson/RubyJacksonModule.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
@@ -17,6 +18,16 @@ import java.util.TimeZone;
 public class RubyJacksonModule extends SimpleModule {
     public static final ObjectMapper static_mapper = new ObjectMapper();
     public static final JsonFactory factory = new JsonFactory(static_mapper).disable(JsonFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW);
+    private static final TimeZone utcTimeZone = TimeZone.getTimeZone("UTC");
+
+    private static final ThreadLocal<SimpleDateFormat>  dateFormat = new ThreadLocal<SimpleDateFormat> ()  {
+        @Override
+        protected SimpleDateFormat initialValue() {
+            SimpleDateFormat rdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
+            rdf.setTimeZone(utcTimeZone);
+            return rdf;
+        }
+    };
 
     static {
         static_mapper.registerModule(new RubyJacksonModule().addSerializer(
@@ -27,7 +38,7 @@ public class RubyJacksonModule extends SimpleModule {
     }
 
     private RubyJacksonModule() {
-        super("JrJacksonStrModule", new Version(1, 2, 18, "0", "com.jrjackson.jruby", "jrjackson"));
+        super("JrJacksonStrModule", new Version(1, 2, 28, "0", "com.jrjackson.jruby", "jrjackson"));
     }
 
     public static ObjectMapper mapperWith(Ruby ruby, RubyKeyConverter nameConverter,
@@ -46,17 +57,18 @@ public class RubyJacksonModule extends SimpleModule {
     }
 
     public static DefaultSerializerProvider createProvider(SimpleDateFormat sdf) {
-        static_mapper.setDateFormat(sdf);
+        // Use a copy of the SerializationConfig to avoid calling setDateFormat on the static ObjectMapper
+        // object, removing its thread safety properties. In future, we might want to think about doing
+        // a refactor to use ObjectWriters instead of modifying serialization configs.
+        SerializationConfig config = static_mapper.getSerializationConfig().with(sdf);
         return ((DefaultSerializerProvider) static_mapper.getSerializerProvider()).createInstance(
-                static_mapper.getSerializationConfig(),
+                config,
                 static_mapper.getSerializerFactory()
         );
     }
 
     public static DefaultSerializerProvider createProvider() {
-        SimpleDateFormat rdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
-        rdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return createProvider(rdf);
+        return createProvider(dateFormat.get());
     }
 
     public static ObjectMapper rawBigNumberMapper() {

data/test/jrjackson_test.rb

@@ -548,6 +548,21 @@ class JrJacksonTest < Test::Unit::TestCase
     assert_equal "{\"foo\":9223372036854775808,\"bar\":65536}", actual
   end
 
+
+  # This test failed more often than not before fixing the underlying code
+  # and would fail every time if `100_000.times` was changed to `loop`
+  def test_concurrent_dump
+    now = Time.now
+    num_threads = 100
+
+    threads = num_threads.times.map do |i|
+      Thread.new do
+        100_000.times { JrJackson::Json.dump("a" => now) }
+      end
+    end
+    threads.each(&:join)
+  end
+
   # -----------------------------
 
   def assert_bigdecimal_equal(expected, actual)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: java
 authors:
 - Guy Boertje
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ files:
 - lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.9/jackson-module-afterburner-2.9.9.jar
 - lib/jrjackson.rb
 - lib/jrjackson/build_info.rb
-- lib/jrjackson/jars/jrjackson-1.2.27.jar
+- lib/jrjackson/jars/jrjackson-1.2.28.jar
 - lib/jrjackson/jrjackson.rb
 - lib/jrjackson_jars.rb
 - lib/require_relative_patch.rb
@@ -139,7 +139,7 @@ requirements:
 - jar com.fasterxml.jackson.core:jackson-databind, 2.9.9.3
 - jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.9
 rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: A JRuby wrapper for the java jackson json processor jar