oj 3.13.4 → 3.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de6407e200d1233d9d36804f49cbd3827d6d318220c44221968dae032e80cc31
-  data.tar.gz: 9b0c2f83be6a37ba83677a956e40ba2571128d5ae95efca8e24c56dfcb9fbfc9
+  metadata.gz: 0a287ba77407aab722c31cfa700b92a173015345bc619f4a95ef7baaeff4be93
+  data.tar.gz: b0286ae29d7dff1f71e5691feae47761ad6203f6bdbcf457486443c29b40c6c9
 SHA512:
-  metadata.gz: 506be0671f0aecc01447f625e54eaf3a7e70d6a0d148771e94a8968c18224dae2b9e6c06cd0321dc41f1874e0663dae2c20e43b5e3e88a04d2bb23f160d93a27
-  data.tar.gz: ab6b025efb11d2c5181a869dfa52755a4c891bc0625a9746a8f3b0189792b5e550829f602eb26c84b125b84657a7a4445f3e2b878a01334c26133a0b910edbab
+  metadata.gz: bd679fe51f8564ab17a24a842a7d7c31c097e6cd20b7f46c5949d19717aa24901750314426d2930752f78160bb25c157728b3ec8b1247376816b5dc2857ced27
+  data.tar.gz: 278065333f209b2ef3d10a94dc770f78ff50d9ca2090e39b522083deb1548902f81b8f9493d689401cc4106b21cf5e6d93f17f5cc8da383f86dc1a4d0418ae43

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.13.5 - 2021-09-08
+
+- Assure value strings of zero length are not always cached.
+
 ## 3.13.4 - 2021-09-04
 
 - Fixed concurrent GC issue in the cache.

data/README.md

@@ -64,7 +64,7 @@ links.
 
 ## Releases
 
-See [{file:CHANGELOG.md}](CHANGELOG.md)
+See [{file:CHANGELOG.md}](CHANGELOG.md) and [{file:RELEASE_NOTES.md}](RELEASE_NOTES.md)
 
 ## Links
 

data/RELEASE_NOTES.md

@@ -0,0 +1,55 @@
+# RELEASE NOTES
+
+The release notes here are organized by release. For a list of changes
+see the See [{file:CHANGELOG.md}](CHANGELOG.md) file. In this file are
+the steps to take to aid in keeping things rolling after updating to
+the latest version.
+
+## 3.13.x
+
+This release included a new cache that performs better than the
+earlier cache and a new high performance parser.
+
+### Cache
+
+The new cache includes a least recently used expiration to reduce
+memory use. The cache is also self adjusting and will expand as needed
+for better performance. It also handles Hash keys and string values
+with two options, `:cache_keys`, a boolean and `:cache_str` an
+integer. The `:cache_str` if set to more than zero is the limit for
+the length of string values to cache. The maximum value is 35 which
+allows strings up to 34 bytes to be cached.
+
+One interesting aspect of the cache is not so much the string caching
+which performs similar to the Ruby intern functions but the caching of
+symbols and object attribute names. There is a significant gain for
+symbols and object attributes.
+
+If the cache is not desired then setting the default options to turn
+it off can be done with this line:
+
+``` ruby
+Oj.default_options = { cache_keys: false, cache_str: 0 }
+```
+
+### Oj::Parser
+
+The new parser uses a different core that follows the approach taken
+by [OjC](https://github.com/ohler55/ojc) and
+[OjG](https://github.com/ohler55/ojg). It also takes advantage of the
+bulk Array and Hash functions. Another issue the new parser addresses
+is option management. Instead of a single global default_options each
+parser instance maintains it's own options.
+
+There is a price to be paid when using the Oj::Parser. The API is not
+the same the older parser. A single parser can only be used in a
+single thread. This allows reuse of internal buffers for additional
+improvements in performance.
+
+The performane advantage of the Oj::Parse is that it is more than 3
+times faster than the Oj::compat_load call and 6 times faster than the
+JSON gem.
+
+### Dump Performance
+
+Thanks to Watson1978 Oj.dump also received a speed boost.

data/ext/oj/custom.c

@@ -955,8 +955,8 @@ static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, c
             }
         }
     } else {
-	//volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
-        volatile VALUE rstr = rb_utf8_str_new(str, len);
+	volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
+        //volatile VALUE rstr = rb_utf8_str_new(str, len);
 
         if (Qundef == rkey) {
             if (Yes == pi->options.sym_key) {

data/ext/oj/strict.c

@@ -16,7 +16,7 @@
 VALUE oj_cstr_to_value(const char *str, size_t len, size_t cache_str) {
     volatile VALUE rstr = Qnil;
 
-    if (len <= cache_str) {
+    if (len < cache_str) {
 	rstr = oj_str_intern(str, len);
     } else {
         rstr = rb_str_new(str, len);
@@ -37,7 +37,7 @@ VALUE oj_calc_hash_key(ParseInfo pi, Val parent) {
         } else {
             rkey = rb_str_new(parent->key, parent->klen);
             rkey = oj_encode(rkey);
-            OBJ_FREEZE(rkey);
+	    OBJ_FREEZE(rkey); // frozen when used as a Hash key anyway
         }
         return rkey;
     }

data/lib/oj/version.rb

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

data/test/bar.rb

@@ -0,0 +1,35 @@
+#!/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 'active_support'
+require "active_support/json"
+
+$s = "\u2014 & \n \u{1F618}"
+
+=begin
+def check(label)
+  puts "\n--- #{label} --------------------"
+
+  ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
+  puts "with standard_json == true: t.to_json - #{$t.to_json}"
+  ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
+  puts "with standard_json == false: t.to_json - #{$t.to_json}"
+end
+
+check('Before Oj')
+=end
+
+require 'oj'
+
+ActiveSupport::JSON::Encoding.escape_html_entities_in_json = false
+puts "ActiveSupport.encode(s) - #{ActiveSupport::JSON.encode($s)}"
+
+Oj.optimize_rails
+Oj.default_options = { mode: :rails }
+
+puts "Oj.dump(s) - #{Oj.dump($s)}"

data/test/baz.rb

@@ -0,0 +1,16 @@
+#!/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'
+Oj.mimic_JSON()
+
+begin
+::JSON.load('name=&email=&subject=&comment=&submit=Send+Message')
+rescue ::JSON::ParserError
+  puts "*** Pass"
+end

data/test/foo.rb

@@ -1,11 +1,13 @@
 #!/usr/bin/env ruby
 
-$: << '.'
-$: << '../lib'
-$: << '../ext'
-
 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/prec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'oj'
+
+extras = {"locationLng" => -97.14690769100295}
+
+Oj.default_options = {float_precision: 17}
+
+encoded = Oj.dump(extras)
+puts encoded
+puts Oj.load(encoded)
+
+require "active_record"
+
+Oj::Rails.set_encoder()
+Oj::Rails.set_decoder()
+
+Oj.default_options = {float_precision: 17}
+# Using Oj rails encoder, gets the correct value: {"locationLng":-97.14690769100295}
+encoded = ActiveSupport::JSON.encode(extras)
+puts encoded
+puts ActiveSupport::JSON.decode(encoded)
+puts Oj.load(encoded)

data/test/zoo.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+#require 'json'
+
+$: << File.dirname(__FILE__)
+require 'helper'
+require 'oj'
+
+Oj.mimic_JSON
+puts "\u3074"
+
+puts JSON.dump(["\u3074"])
+puts JSON.generate(["\u3074"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.13.4
+  version: 3.13.5
 platform: ruby
 authors:
 - Peter Ohler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -94,6 +94,7 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- RELEASE_NOTES.md
 - ext/oj/buf.h
 - ext/oj/cache.c
 - ext/oj/cache.h
@@ -195,8 +196,8 @@ files:
 - test/activesupport6/test_common.rb
 - test/activesupport6/test_helper.rb
 - test/activesupport6/time_zone_test_helpers.rb
-- test/benny.rb
-- test/big.rb
+- test/bar.rb
+- test/baz.rb
 - test/files.rb
 - test/foo.rb
 - test/helper.rb
@@ -232,6 +233,7 @@ files:
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/perf_wab.rb
+- test/prec.rb
 - test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
@@ -258,7 +260,6 @@ files:
 - test/test_null.rb
 - test/test_object.rb
 - test/test_parser.rb
-- test/test_parser_memory.rb
 - test/test_parser_saj.rb
 - test/test_parser_usual.rb
 - test/test_rails.rb
@@ -271,6 +272,7 @@ files:
 - test/tests.rb
 - test/tests_mimic.rb
 - test/tests_mimic_addition.rb
+- test/zoo.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -281,7 +283,7 @@ metadata:
   homepage_uri: http://www.ohler.com/oj/
   source_code_uri: https://github.com/ohler55/oj
   wiki_uri: https://github.com/ohler55/oj/wiki
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Oj
@@ -301,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
@@ -325,8 +327,8 @@ test_files:
 - test/activesupport6/test_common.rb
 - test/activesupport6/test_helper.rb
 - test/activesupport6/time_zone_test_helpers.rb
-- test/benny.rb
-- test/big.rb
+- test/bar.rb
+- test/baz.rb
 - test/files.rb
 - test/foo.rb
 - test/helper.rb
@@ -362,6 +364,7 @@ test_files:
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/perf_wab.rb
+- test/prec.rb
 - test/sample/change.rb
 - test/sample/dir.rb
 - test/sample/doc.rb
@@ -388,7 +391,6 @@ test_files:
 - test/test_null.rb
 - test/test_object.rb
 - test/test_parser.rb
-- test/test_parser_memory.rb
 - test/test_parser_saj.rb
 - test/test_parser_usual.rb
 - test/test_rails.rb
@@ -401,3 +403,4 @@ test_files:
 - test/tests.rb
 - test/tests_mimic.rb
 - test/tests_mimic_addition.rb
+- test/zoo.rb

data/test/benny.rb

@@ -1,50 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal
-
-require 'bundler/inline'
-
-gemfile do
-  source 'https://rubygems.org'
-
-  gem 'oj'
-  gem 'benchmark-ips', require: 'benchmark/ips'
-end
-
-require 'json'
-require 'open-uri'
-
-CANADA_DATA_JSON = URI.parse('https://raw.githubusercontent.com/serde-rs/json-benchmark/master/data/canada.json').read
-CANADA_DATA = JSON.parse(CANADA_DATA_JSON)
-
-Benchmark.ips do |x|
-  x.config(:time => 10, :warmup => 5)
-
-  x.report("marshall Canada data with Oj") do
-    Oj.dump(CANADA_DATA)
-  end
-
-  x.report("marshall Canada data with JSON") do
-    JSON.dump(CANADA_DATA)
-  end
-
-  x.compare!
-end
-
-Oj.default_options = {
-  mode: :strict,
-  bigdecimal_load: :fast
-}
-
-Benchmark.ips do |x|
-  x.config(:time => 10, :warmup => 5)
-
-  x.report("unmarshall Canada data with Oj") do
-    Oj.load(CANADA_DATA_JSON)
-  end
-
-  x.report("unmarshall Canada data with JSON") do
-    JSON.parse(CANADA_DATA_JSON)
-  end
-
-  x.compare!
-end

data/test/big.rb

@@ -1,15 +0,0 @@
-#require 'active_support'
-#require 'active_support/core_ext'
-#require 'active_support/json'
-require 'oj'
-
-#Oj.optimize_rails
-Oj.mimic_JSON
-
-h = {:type=>:record, :name=>:group, :namespace=>"com.salsify.identity", :fields=>[{:name=>"id", :type=>{:name=>:salsify_uuid, :type=>:fixed, :namespace=>"com.salsify", :size=>38}}, {:name=>"type", :type=>"string", :default=>"groups"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"name", :type=>"string"}, {:name=>"policy", :type=>[:null, {:type=>:record, :name=>:policy, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"policies"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"name", :type=>"string"}, {:name=>"statements", :type=>{:type=>:array, :items=>{:type=>:record, :name=>:statement, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"statements"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"action", :type=>{:name=>"__statement_action_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:manage, :read]}}, {:name=>"resource", :type=>{:name=>"__statement_resource_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:product, :digital_asset]}}, {:name=>"conditions", :type=>{:type=>:array, :items=>{:type=>:record, :name=>:condition, :namespace=>"com.salsify.security", :fields=>[{:name=>"created_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"updated_at", :type=>{:type=>"long", :logicalType=>"timestamp-micros"}}, {:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :default=>"conditions"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}, {:name=>"operator", :type=>{:name=>"__condition_operator_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:equals]}}, {:name=>"attribute_type", :type=>{:name=>"__condition_attribute_type_enum", :type=>:enum, :namespace=>"com.salsify.security", :symbols=>[:resource]}}, {:name=>"value", :type=>"string"}, {:name=>"attribute", :type=>[:null, {:type=>:record, :name=>:reference, :namespace=>"com.salsify", :fields=>[{:name=>"id", :type=>"com.salsify.salsify_uuid"}, {:name=>"type", :type=>"string", :doc=>"snake_case, plural name for the resource type"}, {:name=>"external_id", :type=>[:null, "string"], :default=>nil}]}], :default=>nil}, {:name=>"broken", :type=>[:null, "boolean"], :default=>nil}]}}}]}}}]}], :default=>nil}]}
-
-#Oj.dump(h)
-puts JSON.pretty_generate(h)
-#puts JSON.fast_generate(h)
-#puts JSON.generate(h)
-

data/test/test_parser_memory.rb

@@ -1,45 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-%w(lib ext test).each do |dir|
-  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
-end
-
-require 'oj'
-
-json =<<-EOF
-{
-  "$id": "https://example.com/person.schema.json",
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "title": "Person",
-  "type": "object",
-  "properties": {
-    "firstName": {
-      "type": "string",
-      "description": "The person's first name."
-    },
-    "lastName": {
-      "type": "string",
-      "description": "The person's last name."
-    },
-    "age": {
-      "description": "Age in years which must be equal to or greater than zero.",
-      "type": "integer",
-      "minimum": 0
-    }
-  }
-}
-EOF
-
-#json = '{"abc": true}'
-#json = '[true,false]'
-
-100_001.times do |i|
-  p = Oj::Parser.new(:usual).parse(json)
-
-  if i % 10_000 == 0
-    GC.start
-    rss = Integer(`ps -o rss= -p #{Process.pid}`) / 1024.0
-    puts "#{i},#{rss} MB"
-  end
-end