oj 3.13.1 → 3.13.5

data/lib/oj/version.rb

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

data/pages/Options.md

@@ -75,12 +75,22 @@ parse option to match the JSON gem. In that case either `Float`,
 If true Hash keys are cached or interned. There are trade-offs with
 caching keys. Large caches will use more memory and in extreme cases
 (like over a million) the cache may be slower than not using
-it. Repeated parsing of similar JSON docs is where cache_keys shines.
+it. Repeated parsing of similar JSON docs is where cache_keys shines
+especially with symbol keys.
+
+There is a maximum length for cached keys. Any key longer than 34
+bytes is not cached. Everything still works but the key is not cached.
 
 ### :cache_strings [Int]
 
 Shorter strings can be cached for better performance. A limit,
-cache_strings, defines the upper limit on what strings are cached.
+cache_strings, defines the upper limit on what strings are cached. As
+with cached keys only strings less than 35 bytes are cached even if
+the limit is set higher. Setting the limit to zero effectively
+disables the caching of string values.
+
+Note that caching for strings is for string values and not Hash keys
+or Object attributes.
 
 ### :circular [Boolean]
 
@@ -268,7 +278,7 @@ Use symbols instead of strings for hash keys.
 ### :symbolize_names [Boolean]
 
 Like :symbol_keys has keys are made into symbols but only when
-mimicing the JSON gem and then only as the JSON gem honors it so
+mimicking the JSON gem and then only as the JSON gem honors it so
 JSON.parse honors the option but JSON.load does not.
 
 ### :trace

data/pages/Parser.md

@@ -42,12 +42,12 @@ bleed over to other instances.
 
 ## How
 
-It's wonderfull to wish for a faster parser that solves all the
+It's wonderful to wish for a faster parser that solves all the
 annoyances of the previous parser but how was it done is a much more
 interesting question to answer.
 
 At the core, the API for parsing was changed. Instead of a sinle
-global parser any number of parsers can be created and each is seprate
+global parser any number of parsers can be created and each is separate
 from the others. The parser itself is able to rip through a JSON
 string, stream, or file and then make calls to a delegate to process
 the JSON elements according to the delegate behavior. This is similar
@@ -206,7 +206,7 @@ in array creation.
 
 For Hash the story is a little different. The bulk insert for Hash
 alternates keys and values but there is a wrinkle to consider. Since
-Ruby Object creation is triggered by the occurance of an element that
+Ruby Object creation is triggered by the occurrence of an element that
 matches a creation identifier the creation of a collection is not just
 for Array and Hash but also Object. Setting Object attributes uses an
 ID and not a VALUE. For that reason the keys should not be created as

data/pages/Rails.md

@@ -41,7 +41,7 @@ The globals that ActiveSupport uses for encoding are:
 
 Those globals are aliased to also be accessed from the ActiveSupport module
 directly so `ActiveSupport::JSON::Encoding.time_precision` can also be accessed
-from `ActiveSupport.time_precision`. Oj makes use of these globals in mimicing
+from `ActiveSupport.time_precision`. Oj makes use of these globals in mimicking
 Rails after the `Oj::Rails.set_encode()` method is called. That also sets the
 `ActiveSupport.json_encoder` to the `Oj::Rails::Encoder` class.
 
@@ -125,7 +125,7 @@ gem 'oj', '3.7.12'
    Ruby which is used by the json gem and by Rails. Ruby varies the
    significant digits which can be either 16 or 17 depending on the value.
 
-2. Optimized Hashs do not collapse keys that become the same in the output. As
+2. Optimized Hashes do not collapse keys that become the same in the output. As
    an example, a non-String object that has a `to_s()` method will become the
    return value of the `to_s()` method in the output without checking to see if
    that has already been used. This could occur is a mix of String and Symbols

data/test/foo.rb

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 
-$: << File.dirname(__FILE__)
-$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
-%w(lib ext).each do |dir|
-  $: << File.join($oj_dir, dir)
-end
-
 require 'oj'
 
-p = Oj::Parser.new(:debug)
+Oj::default_options = {cache_str: 0, cache_keys: true, mode: :strict}
+
+puts "Ruby version: #{RUBY_VERSION}"
+puts "Oj version: #{Oj::VERSION}"
+
+puts "cache_keys: #{Oj::default_options[:cache_keys]}"
+puts "cache_str: #{Oj::default_options[:cache_str]}"
 
-p.parse("[true, false]")
+Oj.load('{"":""}').each_pair {|k,v| puts "k.frozen?: #{k.frozen?}\nv.frozen?: #{v.frozen?}"}

data/test/json_gem/json_generator_test.rb

@@ -113,7 +113,7 @@ EOT
   end
 
   # TBD Implement JSON.state to return state class.
-  # set state attibutes from defaults
+  # set state attributes from defaults
   # implement methods
   # circular should use circular in defaults or maybe always set to true, allow changes with [:check_circular]=
   def test_states

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

data/test/test_hash.rb

@@ -5,7 +5,7 @@ $: << File.dirname(__FILE__)
 
 require 'helper'
 
-class Hashi < Minitest::Test
+class HashTest < Minitest::Test
 
   module TestModule
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.13.1
+  version: 3.13.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -91,8 +91,10 @@ extra_rdoc_files:
 - pages/Security.md
 - pages/WAB.md
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
+- RELEASE_NOTES.md
 - ext/oj/buf.h
 - ext/oj/cache.c
 - ext/oj/cache.h
@@ -218,11 +220,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 +351,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