oj 3.13.2 → 3.13.3

data/ext/oj/wab.c

@@ -305,11 +305,14 @@ static VALUE calc_hash_key(ParseInfo pi, Val parent) {
     if (Yes == pi->options.cache_keys) {
         rkey = oj_sym_intern(parent->key, parent->klen);
     } else {
-        rkey = rb_str_new(parent->key, parent->klen);
-        rkey = oj_encode(rkey);
+#if HAVE_RB_ENC_INTERNED_STR
+        rkey = rb_enc_interned_str(parent->key, parent->klen, oj_utf8_encoding);
+#else
+	rkey = rb_utf8_str_new(parent->key, parent->klen);
         rkey = rb_str_intern(rkey);
+        OBJ_FREEZE(rkey);
+#endif
     }
-    OBJ_FREEZE(rkey);
     return rkey;
 }
 

data/lib/oj/state.rb

@@ -1,7 +1,7 @@
 
 module JSON
   module Ext
-    module Generator 
+    module Generator
       unless defined?(::JSON::Ext::Generator::State)
         # This class exists for json gem compatibility only. While it can be
         # used as the options for other than compatibility a simple Hash is
@@ -44,11 +44,11 @@ module JSON
           def to_h()
             return @attrs.dup
           end
-          
+
           def to_hash()
             return @attrs.dup
           end
-          
+
           def allow_nan?()
             @attrs[:allow_nan]
           end
@@ -104,7 +104,7 @@ module JSON
           def has_key?(k)
             @attrs.has_key?(key.to_sym)
           end
-          
+
           # Handles requests for Hash values. Others cause an Exception to be raised.
           # @param [Symbol|String] m method symbol
           # @return [Boolean] the value of the specified instance variable.
@@ -116,11 +116,12 @@ module JSON
               m = m.to_s[0..-2]
               m = m.to_sym
               return @attrs.store(m, args[0])
-            else
+	    end
+	    if @attrs.has_key?(m.to_sym)
               raise ArgumentError.new("wrong number of arguments (#{args.size} for 0 with #{m}) to method #{m}") unless args.nil? or args.empty?
               return @attrs[m.to_sym]
-            end
-            raise NoMethodError.new("undefined method #{m}", m)
+	    end
+	    return @attrs.send(m, *args, &block)
           end
 
         end # State

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module.
-  VERSION = '3.13.2'
+  VERSION = '3.13.3'
 end

data/test/mem.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'oj'
+
+Oj.default_options = { mode: :rails, cache_keys: false, cache_str: -1 }
+
+def mem
+  `ps -o rss= -p #{$$}`.to_i
+end
+
+('a'..'z').each { |a|
+  ('a'..'z').each { |b|
+    ('a'..'z').each { |c|
+      ('a'..'z').each { |d|
+	('a'..'z').each { |e|
+	  ('a'..'z').each { |f|
+	    key = "#{a}#{b}#{c}#{d}#{e}#{f}"
+	    x = Oj.load(%|{ "#{key}": 101}|)
+	    #Oj.dump(x)
+	  }
+	}
+      }
+    }
+    puts "#{a}#{b} #{mem}"
+  }
+}
+
+Oj::Parser.new(:usual)

data/test/perf_once.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'oj'
+
+filename = 'tmp.json'
+File.open(filename, "w") { |f|
+  cnt = 0
+  f.puts('{')
+  ('a'..'z').each { |a|
+    ('a'..'z').each { |b|
+      ('a'..'z').each { |c|
+	('a'..'z').each { |d|
+	  f.puts(%|"#{a}#{b}#{c}#{d}":#{cnt},|)
+	  cnt += 1
+	}
+      }
+    }
+  }
+  f.puts('"_last":0}')
+}
+
+def mem
+  `ps -o rss= -p #{$$}`.to_i
+end
+
+Oj.default_options = { mode: :strict, cache_keys: false, cache_str: -1 }
+start = Time.now
+Oj.load_file('tmp.json')
+dur = Time.now - start
+GC.start
+puts "no cache duration: #{dur} @ #{mem}"
+
+Oj.default_options = { cache_keys: true }
+start = Time.now
+Oj.load_file('tmp.json')
+dur = Time.now - start
+GC.start
+puts "initial cache duration: #{dur} @ #{mem}"
+
+start = Time.now
+Oj.load_file('tmp.json')
+dur = Time.now - start
+GC.start
+puts "second cache duration: #{dur} @ #{mem}"
+
+10.times{ GC.start }
+start = Time.now
+Oj.load_file('tmp.json')
+dur = Time.now - start
+GC.start
+puts "after several GCs cache duration: #{dur} @ #{mem}"
+
+# TBD check memory use

data/test/perf_parser.rb

@@ -53,7 +53,7 @@ Oj.default_options = {create_id: '^', create_additions: true, class_cache: true}
 if $cache_keys
   Oj.default_options = {cache_keys: true, cache_str: 6, symbol_keys: $symbol_keys}
 else
-  Oj.default_options = {cache_keys: false, cache_str: 0, symbol_keys: $symbol_keys}
+  Oj.default_options = {cache_keys: false, cache_str: -1, symbol_keys: $symbol_keys}
 end
 JSON.parser = JSON::Ext::Parser
 
@@ -164,6 +164,11 @@ $obj_json = %|{
   "juliet": "junk"
 }|
 
+
+p_usual = Oj::Parser.new(:usual)
+p_usual.cache_keys = $cache_keys
+p_usual.cache_strings = ($cache_keys ? 6 : 0)
+p_usual.symbol_keys = $symbol_keys
 p_usual.create_id = '^'
 p_usual.class_cache = true
 p_usual.ignore_json_create = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.13.2
+  version: 3.13.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -218,11 +218,13 @@ files:
 - test/json_gem/json_parser_test.rb
 - test/json_gem/json_string_matching_test.rb
 - test/json_gem/test_helper.rb
+- test/mem.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
 - test/perf_file.rb
 - test/perf_object.rb
+- test/perf_once.rb
 - test/perf_parser.rb
 - test/perf_saj.rb
 - test/perf_scp.rb
@@ -347,11 +349,13 @@ test_files:
 - test/json_gem/json_parser_test.rb
 - test/json_gem/json_string_matching_test.rb
 - test/json_gem/test_helper.rb
+- test/mem.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
 - test/perf_file.rb
 - test/perf_object.rb
+- test/perf_once.rb
 - test/perf_parser.rb
 - test/perf_saj.rb
 - test/perf_scp.rb