oj 2.18.5 → 3.16.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/CHANGELOG.md +1452 -0
- data/README.md +53 -221
- data/RELEASE_NOTES.md +61 -0
- data/ext/oj/buf.h +54 -72
- data/ext/oj/cache.c +329 -0
- data/ext/oj/cache.h +22 -0
- data/ext/oj/cache8.c +61 -63
- data/ext/oj/cache8.h +12 -39
- data/ext/oj/circarray.c +38 -67
- data/ext/oj/circarray.h +16 -42
- data/ext/oj/code.c +214 -0
- data/ext/oj/code.h +40 -0
- data/ext/oj/compat.c +194 -110
- data/ext/oj/custom.c +1074 -0
- data/ext/oj/debug.c +126 -0
- data/ext/oj/dump.c +1276 -2494
- data/ext/oj/dump.h +110 -0
- data/ext/oj/dump_compat.c +897 -0
- data/ext/oj/dump_leaf.c +162 -0
- data/ext/oj/dump_object.c +710 -0
- data/ext/oj/dump_strict.c +399 -0
- data/ext/oj/encode.h +7 -42
- data/ext/oj/encoder.c +43 -0
- data/ext/oj/err.c +28 -53
- data/ext/oj/err.h +49 -46
- data/ext/oj/extconf.rb +33 -32
- data/ext/oj/fast.c +1082 -1098
- data/ext/oj/intern.c +313 -0
- data/ext/oj/intern.h +22 -0
- data/ext/oj/mem.c +318 -0
- data/ext/oj/mem.h +53 -0
- data/ext/oj/mimic_json.c +919 -0
- data/ext/oj/object.c +545 -625
- data/ext/oj/odd.c +158 -168
- data/ext/oj/odd.h +32 -58
- data/ext/oj/oj.c +1727 -2080
- data/ext/oj/oj.h +334 -259
- data/ext/oj/parse.c +974 -753
- data/ext/oj/parse.h +97 -90
- data/ext/oj/parser.c +1600 -0
- data/ext/oj/parser.h +103 -0
- data/ext/oj/rails.c +1478 -0
- data/ext/oj/rails.h +18 -0
- data/ext/oj/reader.c +136 -163
- data/ext/oj/reader.h +76 -112
- data/ext/oj/resolve.c +45 -94
- data/ext/oj/resolve.h +7 -34
- data/ext/oj/rxclass.c +144 -0
- data/ext/oj/rxclass.h +26 -0
- data/ext/oj/saj.c +445 -511
- data/ext/oj/saj2.c +584 -0
- data/ext/oj/saj2.h +23 -0
- data/ext/oj/scp.c +82 -143
- data/ext/oj/simd.h +10 -0
- data/ext/oj/sparse.c +749 -644
- data/ext/oj/stream_writer.c +329 -0
- data/ext/oj/strict.c +114 -112
- data/ext/oj/string_writer.c +517 -0
- data/ext/oj/trace.c +72 -0
- data/ext/oj/trace.h +55 -0
- data/ext/oj/usual.c +1218 -0
- data/ext/oj/usual.h +69 -0
- data/ext/oj/util.c +136 -0
- data/ext/oj/util.h +20 -0
- data/ext/oj/val_stack.c +75 -72
- data/ext/oj/val_stack.h +94 -127
- data/ext/oj/validate.c +46 -0
- data/ext/oj/wab.c +586 -0
- data/lib/oj/active_support_helper.rb +1 -3
- data/lib/oj/bag.rb +8 -1
- data/lib/oj/easy_hash.rb +21 -13
- data/lib/oj/error.rb +10 -12
- data/lib/oj/json.rb +188 -0
- data/lib/oj/mimic.rb +165 -26
- data/lib/oj/saj.rb +20 -6
- data/lib/oj/schandler.rb +5 -4
- data/lib/oj/state.rb +135 -0
- data/lib/oj/version.rb +2 -3
- data/lib/oj.rb +3 -31
- data/pages/Advanced.md +22 -0
- data/pages/Compatibility.md +25 -0
- data/pages/Custom.md +23 -0
- data/pages/Encoding.md +65 -0
- data/pages/InstallOptions.md +20 -0
- data/pages/JsonGem.md +94 -0
- data/pages/Modes.md +161 -0
- data/pages/Options.md +337 -0
- data/pages/Parser.md +309 -0
- data/pages/Rails.md +167 -0
- data/pages/Security.md +20 -0
- data/pages/WAB.md +13 -0
- metadata +126 -163
- data/ext/oj/hash.c +0 -163
- data/ext/oj/hash.h +0 -46
- data/ext/oj/hash_test.c +0 -512
- data/test/_test_active.rb +0 -76
- data/test/_test_active_mimic.rb +0 -96
- data/test/_test_mimic_rails.rb +0 -126
- data/test/activesupport_datetime_test.rb +0 -23
- data/test/bug.rb +0 -51
- data/test/bug2.rb +0 -10
- data/test/bug3.rb +0 -46
- data/test/bug_fast.rb +0 -32
- data/test/bug_load.rb +0 -24
- data/test/crash.rb +0 -111
- data/test/curl/curl_oj.rb +0 -46
- data/test/curl/get_oj.rb +0 -24
- data/test/curl/just_curl.rb +0 -31
- data/test/curl/just_oj.rb +0 -51
- data/test/example.rb +0 -11
- data/test/files.rb +0 -29
- data/test/foo.rb +0 -24
- data/test/helper.rb +0 -27
- data/test/io.rb +0 -48
- data/test/isolated/shared.rb +0 -310
- data/test/isolated/test_mimic_after.rb +0 -13
- data/test/isolated/test_mimic_alone.rb +0 -12
- data/test/isolated/test_mimic_as_json.rb +0 -45
- data/test/isolated/test_mimic_before.rb +0 -13
- data/test/isolated/test_mimic_define.rb +0 -28
- data/test/isolated/test_mimic_rails_after.rb +0 -22
- data/test/isolated/test_mimic_rails_before.rb +0 -21
- data/test/isolated/test_mimic_rails_datetime.rb +0 -27
- data/test/isolated/test_mimic_redefine.rb +0 -15
- data/test/mod.rb +0 -16
- data/test/perf.rb +0 -107
- data/test/perf_compat.rb +0 -128
- data/test/perf_fast.rb +0 -164
- data/test/perf_file.rb +0 -64
- data/test/perf_object.rb +0 -138
- data/test/perf_saj.rb +0 -109
- data/test/perf_scp.rb +0 -151
- data/test/perf_simple.rb +0 -287
- data/test/perf_strict.rb +0 -128
- data/test/rails.rb +0 -50
- data/test/russian.rb +0 -18
- data/test/sample/change.rb +0 -14
- data/test/sample/dir.rb +0 -19
- data/test/sample/doc.rb +0 -36
- data/test/sample/file.rb +0 -48
- data/test/sample/group.rb +0 -16
- data/test/sample/hasprops.rb +0 -16
- data/test/sample/layer.rb +0 -12
- data/test/sample/line.rb +0 -20
- data/test/sample/oval.rb +0 -10
- data/test/sample/rect.rb +0 -10
- data/test/sample/shape.rb +0 -35
- data/test/sample/text.rb +0 -20
- data/test/sample.rb +0 -55
- data/test/sample_json.rb +0 -37
- data/test/struct.rb +0 -29
- data/test/test_compat.rb +0 -398
- data/test/test_debian.rb +0 -53
- data/test/test_fast.rb +0 -458
- data/test/test_file.rb +0 -245
- data/test/test_gc.rb +0 -49
- data/test/test_hash.rb +0 -29
- data/test/test_object.rb +0 -745
- data/test/test_saj.rb +0 -186
- data/test/test_scp.rb +0 -396
- data/test/test_serializer.rb +0 -59
- data/test/test_strict.rb +0 -254
- data/test/test_various.rb +0 -1383
- data/test/test_writer.rb +0 -308
- data/test/write_timebars.rb +0 -31
data/test/perf_compat.rb
DELETED
@@ -1,128 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby -wW1
|
2
|
-
# encoding: UTF-8
|
3
|
-
|
4
|
-
$: << '.'
|
5
|
-
$: << File.join(File.dirname(__FILE__), "../lib")
|
6
|
-
$: << File.join(File.dirname(__FILE__), "../ext")
|
7
|
-
|
8
|
-
require 'optparse'
|
9
|
-
require 'perf'
|
10
|
-
require 'oj'
|
11
|
-
|
12
|
-
$verbose = false
|
13
|
-
$indent = 0
|
14
|
-
$iter = 20000
|
15
|
-
$with_bignum = false
|
16
|
-
$with_nums = true
|
17
|
-
$size = 0
|
18
|
-
|
19
|
-
opts = OptionParser.new
|
20
|
-
opts.on("-v", "verbose") { $verbose = true }
|
21
|
-
opts.on("-c", "--count [Int]", Integer, "iterations") { |i| $iter = i }
|
22
|
-
opts.on("-i", "--indent [Int]", Integer, "indentation") { |i| $indent = i }
|
23
|
-
opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)") { |i| $size = i }
|
24
|
-
opts.on("-h", "--help", "Show this display") { puts opts; Process.exit!(0) }
|
25
|
-
files = opts.parse(ARGV)
|
26
|
-
|
27
|
-
module One
|
28
|
-
module Two
|
29
|
-
module Three
|
30
|
-
class Empty
|
31
|
-
|
32
|
-
def initialize()
|
33
|
-
end
|
34
|
-
|
35
|
-
def eql?(o)
|
36
|
-
self.class == o.class
|
37
|
-
end
|
38
|
-
alias == eql?
|
39
|
-
|
40
|
-
def to_hash()
|
41
|
-
{'json_class' => "#{self.class.name}"}
|
42
|
-
end
|
43
|
-
|
44
|
-
def to_json(*a)
|
45
|
-
%{{"json_class":"#{self.class.name}"}}
|
46
|
-
end
|
47
|
-
|
48
|
-
def self.json_create(h)
|
49
|
-
self.new()
|
50
|
-
end
|
51
|
-
end # Empty
|
52
|
-
end # Three
|
53
|
-
end # Two
|
54
|
-
end # One
|
55
|
-
|
56
|
-
$obj = {
|
57
|
-
'a' => 'Alpha', # string
|
58
|
-
'b' => true, # boolean
|
59
|
-
'c' => 12345, # number
|
60
|
-
'd' => [ true, [false, [-123456789, nil], 3.9676, ['Something else.', false], nil]], # mix it up array
|
61
|
-
'e' => { 'zero' => nil, 'one' => 1, 'two' => 2, 'three' => [3], 'four' => [0, 1, 2, 3, 4] }, # hash
|
62
|
-
'f' => nil, # nil
|
63
|
-
'g' => One::Two::Three::Empty.new(),
|
64
|
-
'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
|
65
|
-
'i' => [[[[[[[nil]]]]]]] # deep array, again, not that deep
|
66
|
-
}
|
67
|
-
|
68
|
-
Oj.default_options = { :indent => $indent, :mode => :compat }
|
69
|
-
|
70
|
-
if 0 < $size
|
71
|
-
s = Oj.dump($obj).size + 1
|
72
|
-
cnt = $size * 1024 / s
|
73
|
-
o = $obj
|
74
|
-
$obj = []
|
75
|
-
cnt.times do
|
76
|
-
$obj << o
|
77
|
-
end
|
78
|
-
end
|
79
|
-
|
80
|
-
$json = Oj.dump($obj)
|
81
|
-
$failed = {} # key is same as String used in tests later
|
82
|
-
|
83
|
-
def capture_error(tag, orig, load_key, dump_key, &blk)
|
84
|
-
begin
|
85
|
-
obj = blk.call(orig)
|
86
|
-
raise "#{tag} #{dump_key} and #{load_key} did not return the same object as the original." unless orig == obj
|
87
|
-
rescue Exception => e
|
88
|
-
$failed[tag] = "#{e.class}: #{e.message}"
|
89
|
-
end
|
90
|
-
end
|
91
|
-
|
92
|
-
# Verify that all packages dump and load correctly and return the same Object as the original.
|
93
|
-
capture_error('Oj:compat', $obj, 'load', 'dump') { |o| Oj.compat_load(Oj.dump(o, :mode => :compat)) }
|
94
|
-
capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
|
95
|
-
require 'json'
|
96
|
-
require 'json/ext'
|
97
|
-
JSON.generator = JSON::Ext::Generator
|
98
|
-
JSON.parser = JSON::Ext::Parser
|
99
|
-
JSON.load(JSON.generate(o))
|
100
|
-
}
|
101
|
-
|
102
|
-
if $verbose
|
103
|
-
puts "size: #{$json.size}"
|
104
|
-
puts "json:\n#{$json}\n"
|
105
|
-
puts "Oj:compat loaded object:\n#{Oj.compat_load($json)}\n"
|
106
|
-
puts "JSON loaded object:\n#{JSON::Ext::Parser.new($json).parse}\n"
|
107
|
-
end
|
108
|
-
|
109
|
-
puts '-' * 80
|
110
|
-
puts "Compat Parse Performance"
|
111
|
-
perf = Perf.new()
|
112
|
-
unless $failed.has_key?('JSON::Ext')
|
113
|
-
perf.add('JSON::Ext', 'parse') { JSON.load($json) }
|
114
|
-
perf.before('JSON::Ext') { JSON.parser = JSON::Ext::Parser }
|
115
|
-
end
|
116
|
-
unless $failed.has_key?('Oj:compat')
|
117
|
-
perf.add('Oj:compat', 'compat_load') { Oj.compat_load($json) }
|
118
|
-
end
|
119
|
-
perf.run($iter)
|
120
|
-
|
121
|
-
puts
|
122
|
-
puts '-' * 80
|
123
|
-
puts
|
124
|
-
|
125
|
-
unless $failed.empty?
|
126
|
-
puts "The following packages were not included for the reason listed"
|
127
|
-
$failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
|
128
|
-
end
|
data/test/perf_fast.rb
DELETED
@@ -1,164 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby -wW1
|
2
|
-
# encoding: UTF-8
|
3
|
-
|
4
|
-
$: << '.'
|
5
|
-
$: << File.join(File.dirname(__FILE__), "../lib")
|
6
|
-
$: << File.join(File.dirname(__FILE__), "../ext")
|
7
|
-
|
8
|
-
require 'optparse'
|
9
|
-
#require 'yajl'
|
10
|
-
require 'perf'
|
11
|
-
require 'json'
|
12
|
-
require 'json/ext'
|
13
|
-
require 'oj'
|
14
|
-
|
15
|
-
$verbose = false
|
16
|
-
$indent = 0
|
17
|
-
$iter = 100000
|
18
|
-
$gets = 0
|
19
|
-
$fetch = false
|
20
|
-
$write = false
|
21
|
-
$read = false
|
22
|
-
|
23
|
-
opts = OptionParser.new
|
24
|
-
opts.on("-v", "verbose") { $verbose = true }
|
25
|
-
opts.on("-c", "--count [Int]", Integer, "iterations") { |i| $iter = i }
|
26
|
-
opts.on("-i", "--indent [Int]", Integer, "indentation") { |i| $indent = i }
|
27
|
-
opts.on("-g", "--gets [Int]", Integer, "number of gets") { |i| $gets = i }
|
28
|
-
opts.on("-f", "fetch") { $fetch = true }
|
29
|
-
opts.on("-w", "write") { $write = true }
|
30
|
-
opts.on("-r", "read") { $read = true }
|
31
|
-
opts.on("-h", "--help", "Show this display") { puts opts; Process.exit!(0) }
|
32
|
-
files = opts.parse(ARGV)
|
33
|
-
|
34
|
-
# This just navigates to each leaf of the JSON structure.
|
35
|
-
def dig(obj, &blk)
|
36
|
-
case obj
|
37
|
-
when Array
|
38
|
-
obj.each { |e| dig(e, &blk) }
|
39
|
-
when Hash
|
40
|
-
obj.values.each { |e| dig(e, &blk) }
|
41
|
-
else
|
42
|
-
blk.yield(obj)
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
$obj = {
|
47
|
-
'a' => 'Alpha', # string
|
48
|
-
'b' => true, # boolean
|
49
|
-
'c' => 12345, # number
|
50
|
-
'd' => [ true, [false, {'12345' => 12345, 'nil' => nil}, 3.967, { 'x' => 'something', 'y' => false, 'z' => true}, nil]], # mix it up array
|
51
|
-
'e' => { 'one' => 1, 'two' => 2 }, # hash
|
52
|
-
'f' => nil, # nil
|
53
|
-
'g' => 12345678901234567890123456789, # big number
|
54
|
-
'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
|
55
|
-
'i' => [[[[[[[nil]]]]]]] # deep array, again, not that deep
|
56
|
-
}
|
57
|
-
|
58
|
-
Oj.default_options = { :indent => $indent, :mode => :compat }
|
59
|
-
|
60
|
-
$json = Oj.dump($obj)
|
61
|
-
$failed = {} # key is same as String used in tests later
|
62
|
-
|
63
|
-
def capture_error(tag, orig, load_key, dump_key, &blk)
|
64
|
-
begin
|
65
|
-
obj = blk.call(orig)
|
66
|
-
raise "#{tag} #{dump_key} and #{load_key} did not return the same object as the original." unless orig == obj
|
67
|
-
rescue Exception => e
|
68
|
-
$failed[tag] = "#{e.class}: #{e.message}"
|
69
|
-
end
|
70
|
-
end
|
71
|
-
|
72
|
-
# Verify that all packages dump and load correctly and return the same Object as the original.
|
73
|
-
capture_error('Oj::Doc', $obj, 'load', 'dump') { |o| Oj::Doc.open(Oj.dump(o, :mode => :strict)) { |f| f.fetch() } }
|
74
|
-
#capture_error('Yajl', $obj, 'encode', 'parse') { |o| Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
|
75
|
-
capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o| JSON.generator = JSON::Ext::Generator; JSON::Ext::Parser.new(JSON.generate(o)).parse }
|
76
|
-
|
77
|
-
if $verbose
|
78
|
-
puts "json:\n#{$json}\n"
|
79
|
-
end
|
80
|
-
|
81
|
-
puts '-' * 80
|
82
|
-
puts "Parse Performance"
|
83
|
-
perf = Perf.new()
|
84
|
-
perf.add('Oj::Doc', 'parse') { Oj::Doc.open($json) {|f| } } unless $failed.has_key?('Oj::Doc')
|
85
|
-
#perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) } unless $failed.has_key?('Yajl')
|
86
|
-
perf.add('JSON::Ext', 'parse') { JSON::Ext::Parser.new($json).parse } unless $failed.has_key?('JSON::Ext')
|
87
|
-
perf.run($iter)
|
88
|
-
|
89
|
-
puts '-' * 80
|
90
|
-
puts "JSON generation Performance"
|
91
|
-
Oj::Doc.open($json) do |doc|
|
92
|
-
perf = Perf.new()
|
93
|
-
perf.add('Oj::Doc', 'dump') { doc.dump() }
|
94
|
-
# perf.add('Yajl', 'encode') { Yajl::Encoder.encode($obj) }
|
95
|
-
perf.add('JSON::Ext', 'fast_generate') { JSON.fast_generate($obj) }
|
96
|
-
perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
|
97
|
-
perf.run($iter)
|
98
|
-
end
|
99
|
-
|
100
|
-
if 0 < $gets
|
101
|
-
puts '-' * 80
|
102
|
-
puts "Parse and get all values Performance"
|
103
|
-
perf = Perf.new()
|
104
|
-
perf.add('Oj::Doc', 'parse') { Oj::Doc.open($json) {|f| $gets.times { f.each_value() {} } } } unless $failed.has_key?('Oj::Doc')
|
105
|
-
# perf.add('Yajl', 'parse') { $gets.times { dig(Yajl::Parser.parse($json)) {} } } unless $failed.has_key?('Yajl')
|
106
|
-
perf.add('JSON::Ext', 'parse') { $gets.times { dig(JSON::Ext::Parser.new($json).parse) {} } } unless $failed.has_key?('JSON::Ext')
|
107
|
-
perf.run($iter)
|
108
|
-
end
|
109
|
-
|
110
|
-
if $fetch
|
111
|
-
puts '-' * 80
|
112
|
-
puts "fetch nested Performance"
|
113
|
-
json_hash = Oj.load($json, :mode => :strict)
|
114
|
-
Oj::Doc.open($json) do |fast|
|
115
|
-
#puts "*** C fetch: #{fast.fetch('/d/2/4/y')}"
|
116
|
-
#puts "*** Ruby fetch: #{json_hash.fetch('d', []).fetch(1, []).fetch(3, []).fetch('x', nil)}"
|
117
|
-
perf = Perf.new()
|
118
|
-
perf.add('Oj::Doc', 'fetch') { fast.fetch('/d/2/4/x'); fast.fetch('/h/a/b/c/d/e/f/g'); fast.fetch('/i/1/1/1/1/1/1/1') }
|
119
|
-
# version that fails gracefully
|
120
|
-
perf.add('Ruby', 'fetch') do
|
121
|
-
json_hash.fetch('d', []).fetch(1, []).fetch(3, []).fetch('x', nil)
|
122
|
-
json_hash.fetch('h', {}).fetch('a', {}).fetch('b', {}).fetch('c', {}).fetch('d', {}).fetch('e', {}).fetch('f', {}).fetch('g', {})
|
123
|
-
json_hash.fetch('i', []).fetch(0, []).fetch(0, []).fetch(0, []).fetch(0, []).fetch(0, []).fetch(0, []).fetch(0, nil)
|
124
|
-
end
|
125
|
-
# version that raises if the path is incorrect
|
126
|
-
# perf.add('Ruby', 'fetch') { $fetch.times { json_hash['d'][1][3][1] } }
|
127
|
-
perf.run($iter)
|
128
|
-
end
|
129
|
-
end
|
130
|
-
|
131
|
-
if $write
|
132
|
-
puts '-' * 80
|
133
|
-
puts "JSON write to file Performance"
|
134
|
-
Oj::Doc.open($json) do |doc|
|
135
|
-
perf = Perf.new()
|
136
|
-
perf.add('Oj::Doc', 'dump') { doc.dump(nil, 'oj.json') }
|
137
|
-
# perf.add('Yajl', 'encode') { File.open('yajl.json', 'w') { |f| Yajl::Encoder.encode($obj, f) } }
|
138
|
-
perf.add('JSON::Ext', 'fast_generate') { File.open('json_ext.json', 'w') { |f| f.write(JSON.fast_generate($obj)) } }
|
139
|
-
perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
|
140
|
-
perf.run($iter)
|
141
|
-
end
|
142
|
-
end
|
143
|
-
|
144
|
-
if $read
|
145
|
-
puts '-' * 80
|
146
|
-
puts "JSON read from file Performance"
|
147
|
-
Oj::Doc.open($json) { |doc| doc.dump(nil, 'oj.json') }
|
148
|
-
# File.open('yajl.json', 'w') { |f| Yajl::Encoder.encode($obj, f) }
|
149
|
-
JSON.generator = JSON::Ext::Generator
|
150
|
-
File.open('json_ext.json', 'w') { |f| f.write(JSON.fast_generate($obj)) }
|
151
|
-
Oj::Doc.open($json) do |doc|
|
152
|
-
perf = Perf.new()
|
153
|
-
perf.add('Oj::Doc', 'open_file') { ::Oj::Doc.open_file('oj.json') }
|
154
|
-
# perf.add('Yajl', 'decode') { Yajl::decoder.decode(File.read('yajl.json')) }
|
155
|
-
perf.add('JSON::Ext', '') { JSON.parse(File.read('json_ext.json')) }
|
156
|
-
perf.before('JSON::Ext') { JSON.parser = JSON::Ext::Parser }
|
157
|
-
perf.run($iter)
|
158
|
-
end
|
159
|
-
end
|
160
|
-
|
161
|
-
unless $failed.empty?
|
162
|
-
puts "The following packages were not included for the reason listed"
|
163
|
-
$failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
|
164
|
-
end
|
data/test/perf_file.rb
DELETED
@@ -1,64 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby -wW1
|
2
|
-
|
3
|
-
$: << '.'
|
4
|
-
$: << '../lib'
|
5
|
-
$: << '../ext'
|
6
|
-
|
7
|
-
if __FILE__ == $0
|
8
|
-
if (i = ARGV.index('-I'))
|
9
|
-
x,path = ARGV.slice!(i, 2)
|
10
|
-
$: << path
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
14
|
-
require 'optparse'
|
15
|
-
require 'oj'
|
16
|
-
require 'perf'
|
17
|
-
|
18
|
-
$indent = 0
|
19
|
-
$iter = 1
|
20
|
-
$size = 1
|
21
|
-
|
22
|
-
opts = OptionParser.new
|
23
|
-
|
24
|
-
opts.on("-r", "read") { do_read = true }
|
25
|
-
opts.on("-c", "--count [Int]", Integer, "iterations") { |i| $iter = i }
|
26
|
-
opts.on("-i", "--indent [Int]", Integer, "indent") { |i| $indent = i }
|
27
|
-
opts.on("-s", "--size [Int]", Integer, "size in Mbytes") { |s| $size = s }
|
28
|
-
|
29
|
-
opts.on("-h", "--help", "Show this display") { puts opts; Process.exit!(0) }
|
30
|
-
files = opts.parse(ARGV)
|
31
|
-
|
32
|
-
$obj = {
|
33
|
-
'a' => 'Alpha', # string
|
34
|
-
'b' => true, # boolean
|
35
|
-
'c' => 12345, # number
|
36
|
-
'd' => [ true, [false, [-123456789, nil], 3.9676, ['Something else.', false], nil]], # mix it up array
|
37
|
-
'e' => { 'zero' => nil, 'one' => 1, 'two' => 2, 'three' => [3], 'four' => [0, 1, 2, 3, 4] }, # hash
|
38
|
-
'f' => nil, # nil
|
39
|
-
'g' => 12345678901234567890123456789, #_bignum
|
40
|
-
'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
|
41
|
-
'i' => [[[[[[[nil]]]]]]] # deep array, again, not that deep
|
42
|
-
}
|
43
|
-
|
44
|
-
json = Oj.dump($obj, :indent => $indent)
|
45
|
-
cnt = ($size * 1024 * 1024 + json.size) / json.size
|
46
|
-
cnt = 1 if 0 == $size
|
47
|
-
|
48
|
-
filename = 'tmp.json'
|
49
|
-
File.open(filename, "w") { |f|
|
50
|
-
cnt.times do
|
51
|
-
Oj.to_stream(f, $obj, :indent => $indent)
|
52
|
-
end
|
53
|
-
}
|
54
|
-
|
55
|
-
Oj.default_options = { :mode => :strict, :indent => $indent }
|
56
|
-
|
57
|
-
puts '-' * 80
|
58
|
-
puts "Read from #{cnt * json.size / (1024 * 1024)} Mb file Performance"
|
59
|
-
perf = Perf.new()
|
60
|
-
perf.add('Oj.load_file', '') { Oj.load_file(filename) }
|
61
|
-
perf.add('Oj.load(string)', '') { Oj.load(File.read(filename)) }
|
62
|
-
perf.add('Oj.load(file)', '') { File.open(filename, 'r') { |f| Oj.load(f) } }
|
63
|
-
perf.run($iter)
|
64
|
-
|
data/test/perf_object.rb
DELETED
@@ -1,138 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby -wW1
|
2
|
-
|
3
|
-
$: << '.'
|
4
|
-
$: << '../lib'
|
5
|
-
$: << '../ext'
|
6
|
-
|
7
|
-
if __FILE__ == $0
|
8
|
-
if (i = ARGV.index('-I'))
|
9
|
-
x,path = ARGV.slice!(i, 2)
|
10
|
-
$: << path
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
14
|
-
require 'optparse'
|
15
|
-
require 'ox'
|
16
|
-
require 'oj'
|
17
|
-
require 'perf'
|
18
|
-
require 'sample'
|
19
|
-
require 'files'
|
20
|
-
|
21
|
-
$circular = false
|
22
|
-
$indent = 0
|
23
|
-
$allow_gc = true
|
24
|
-
|
25
|
-
do_sample = false
|
26
|
-
do_files = false
|
27
|
-
|
28
|
-
do_load = false
|
29
|
-
do_dump = false
|
30
|
-
do_read = false
|
31
|
-
do_write = false
|
32
|
-
$iter = 1000
|
33
|
-
$mult = 1
|
34
|
-
|
35
|
-
opts = OptionParser.new
|
36
|
-
opts.on("-c", "circular options") { $circular = true }
|
37
|
-
|
38
|
-
opts.on("-x", "use sample instead of files") { do_sample = true }
|
39
|
-
opts.on("-g", "no GC during parsing") { $allow_gc = false }
|
40
|
-
|
41
|
-
opts.on("-s", "load and dump as sample Ruby object") { do_sample = true }
|
42
|
-
opts.on("-f", "load and dump as files Ruby object") { do_files = true }
|
43
|
-
|
44
|
-
opts.on("-l", "load") { do_load = true }
|
45
|
-
opts.on("-d", "dump") { do_dump = true }
|
46
|
-
opts.on("-r", "read") { do_read = true }
|
47
|
-
opts.on("-w", "write") { do_write = true }
|
48
|
-
opts.on("-a", "load, dump, read and write") { do_load = true; do_dump = true; do_read = true; do_write = true }
|
49
|
-
|
50
|
-
opts.on("-i", "--iterations [Int]", Integer, "iterations") { |i| $iter = i }
|
51
|
-
opts.on("-m", "--multiply [Int]", Integer, "multiplier") { |i| $mult = i }
|
52
|
-
|
53
|
-
opts.on("-h", "--help", "Show this display") { puts opts; Process.exit!(0) }
|
54
|
-
files = opts.parse(ARGV)
|
55
|
-
|
56
|
-
$obj = nil
|
57
|
-
$xml = nil
|
58
|
-
$mars = nil
|
59
|
-
$json = nil
|
60
|
-
|
61
|
-
unless do_load || do_dump || do_read || do_write
|
62
|
-
do_load = true
|
63
|
-
do_dump = true
|
64
|
-
do_read = true
|
65
|
-
do_write = true
|
66
|
-
end
|
67
|
-
|
68
|
-
# prepare all the formats for input
|
69
|
-
if files.empty?
|
70
|
-
$obj = []
|
71
|
-
$mult.times do
|
72
|
-
$obj << (do_sample ? sample_doc(2) : files('..'))
|
73
|
-
end
|
74
|
-
|
75
|
-
$mars = Marshal.dump($obj)
|
76
|
-
$xml = Ox.dump($obj, :indent => $indent, :circular => $circular)
|
77
|
-
$json = Oj.dump($obj, :indent => $indent, :circular => $circular, :mode => :object)
|
78
|
-
File.open('sample.xml', 'w') { |f| f.write($xml) }
|
79
|
-
File.open('sample.json', 'w') { |f| f.write($json) }
|
80
|
-
File.open('sample.marshal', 'w') { |f| f.write($mars) }
|
81
|
-
else
|
82
|
-
puts "loading and parsing #{files}\n\n"
|
83
|
-
data = files.map do |f|
|
84
|
-
$xml = File.read(f)
|
85
|
-
$obj = Ox.load($xml);
|
86
|
-
$mars = Marshal.dump($obj)
|
87
|
-
$json = Oj.dump($obj, :indent => $indent, :circular => $circular)
|
88
|
-
end
|
89
|
-
end
|
90
|
-
|
91
|
-
Oj.default_options = { :mode => :object, :indent => $indent, :circular => $circular, :allow_gc => $allow_gc }
|
92
|
-
#puts "json: #{$json.size}"
|
93
|
-
#puts "xml: #{$xml.size}"
|
94
|
-
#puts "marshal: #{$mars.size}"
|
95
|
-
|
96
|
-
|
97
|
-
if do_load
|
98
|
-
puts '-' * 80
|
99
|
-
puts "Load Performance"
|
100
|
-
perf = Perf.new()
|
101
|
-
perf.add('Oj.object', 'load') { Oj.object_load($json) }
|
102
|
-
perf.add('Ox', 'load') { Ox.load($xml, :mode => :object) }
|
103
|
-
perf.add('Marshal', 'load') { Marshal.load($mars) }
|
104
|
-
perf.run($iter)
|
105
|
-
end
|
106
|
-
|
107
|
-
if do_dump
|
108
|
-
puts '-' * 80
|
109
|
-
puts "Dump Performance"
|
110
|
-
perf = Perf.new()
|
111
|
-
perf.add('Oj', 'dump') { Oj.dump($obj) }
|
112
|
-
perf.add('Ox', 'dump') { Ox.dump($obj, :indent => $indent, :circular => $circular) }
|
113
|
-
perf.add('Marshal', 'dump') { Marshal.dump($obj) }
|
114
|
-
perf.run($iter)
|
115
|
-
end
|
116
|
-
|
117
|
-
if do_read
|
118
|
-
puts '-' * 80
|
119
|
-
puts "Read from file Performance"
|
120
|
-
perf = Perf.new()
|
121
|
-
perf.add('Oj', 'load') { Oj.load_file('sample.json') }
|
122
|
-
#perf.add('Oj', 'load') { Oj.load(File.read('sample.json')) }
|
123
|
-
perf.add('Ox', 'load_file') { Ox.load_file('sample.xml', :mode => :object) }
|
124
|
-
perf.add('Marshal', 'load') { Marshal.load(File.new('sample.marshal')) }
|
125
|
-
perf.run($iter)
|
126
|
-
end
|
127
|
-
|
128
|
-
if do_write
|
129
|
-
puts '-' * 80
|
130
|
-
puts "Write to file Performance"
|
131
|
-
perf = Perf.new()
|
132
|
-
perf.add('Oj', 'to_file') { Oj.to_file('sample.json', $obj) }
|
133
|
-
perf.add('Ox', 'to_file') { Ox.to_file('sample.xml', $obj, :indent => $indent, :circular => $circular) }
|
134
|
-
perf.add('Marshal', 'dump') { Marshal.dump($obj, File.new('sample.marshal', 'w')) }
|
135
|
-
perf.run($iter)
|
136
|
-
end
|
137
|
-
|
138
|
-
|
data/test/perf_saj.rb
DELETED
@@ -1,109 +0,0 @@
|
|
1
|
-
#!/usr/bin/env ruby -wW1
|
2
|
-
# encoding: UTF-8
|
3
|
-
|
4
|
-
$: << '.'
|
5
|
-
$: << File.join(File.dirname(__FILE__), "../lib")
|
6
|
-
$: << File.join(File.dirname(__FILE__), "../ext")
|
7
|
-
|
8
|
-
require 'optparse'
|
9
|
-
require 'yajl'
|
10
|
-
require 'perf'
|
11
|
-
require 'json'
|
12
|
-
require 'json/ext'
|
13
|
-
require 'oj'
|
14
|
-
|
15
|
-
$verbose = false
|
16
|
-
$indent = 0
|
17
|
-
$iter = 10000
|
18
|
-
$gets = 0
|
19
|
-
$fetch = false
|
20
|
-
$write = false
|
21
|
-
$read = false
|
22
|
-
|
23
|
-
opts = OptionParser.new
|
24
|
-
opts.on("-v", "verbose") { $verbose = true }
|
25
|
-
opts.on("-c", "--count [Int]", Integer, "iterations") { |i| $iter = i }
|
26
|
-
opts.on("-i", "--indent [Int]", Integer, "indentation") { |i| $indent = i }
|
27
|
-
opts.on("-g", "--gets [Int]", Integer, "number of gets") { |i| $gets = i }
|
28
|
-
opts.on("-f", "fetch") { $fetch = true }
|
29
|
-
opts.on("-w", "write") { $write = true }
|
30
|
-
opts.on("-r", "read") { $read = true }
|
31
|
-
opts.on("-h", "--help", "Show this display") { puts opts; Process.exit!(0) }
|
32
|
-
files = opts.parse(ARGV)
|
33
|
-
|
34
|
-
class AllSaj < Oj::Saj
|
35
|
-
def initialize()
|
36
|
-
end
|
37
|
-
|
38
|
-
def hash_start(key)
|
39
|
-
end
|
40
|
-
|
41
|
-
def hash_end(key)
|
42
|
-
end
|
43
|
-
|
44
|
-
def array_start(key)
|
45
|
-
end
|
46
|
-
|
47
|
-
def array_end(key)
|
48
|
-
end
|
49
|
-
|
50
|
-
def add_value(value, key)
|
51
|
-
end
|
52
|
-
end # AllSaj
|
53
|
-
|
54
|
-
class NoSaj < Oj::Saj
|
55
|
-
def initialize()
|
56
|
-
end
|
57
|
-
end # NoSaj
|
58
|
-
|
59
|
-
saj_handler = AllSaj.new()
|
60
|
-
no_saj = NoSaj.new()
|
61
|
-
|
62
|
-
$obj = {
|
63
|
-
'a' => 'Alpha', # string
|
64
|
-
'b' => true, # boolean
|
65
|
-
'c' => 12345, # number
|
66
|
-
'd' => [ true, [false, {'12345' => 12345, 'nil' => nil}, 3.967, { 'x' => 'something', 'y' => false, 'z' => true}, nil]], # mix it up array
|
67
|
-
'e' => { 'one' => 1, 'two' => 2 }, # hash
|
68
|
-
'f' => nil, # nil
|
69
|
-
'g' => 12345678901234567890123456789, # big number
|
70
|
-
'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
|
71
|
-
'i' => [[[[[[[nil]]]]]]] # deep array, again, not that deep
|
72
|
-
}
|
73
|
-
|
74
|
-
Oj.default_options = { :indent => $indent, :mode => :compat }
|
75
|
-
|
76
|
-
$json = Oj.dump($obj)
|
77
|
-
$failed = {} # key is same as String used in tests later
|
78
|
-
|
79
|
-
def capture_error(tag, orig, load_key, dump_key, &blk)
|
80
|
-
begin
|
81
|
-
obj = blk.call(orig)
|
82
|
-
raise "#{tag} #{dump_key} and #{load_key} did not return the same object as the original." unless orig == obj
|
83
|
-
rescue Exception => e
|
84
|
-
$failed[tag] = "#{e.class}: #{e.message}"
|
85
|
-
end
|
86
|
-
end
|
87
|
-
|
88
|
-
# Verify that all packages dump and load correctly and return the same Object as the original.
|
89
|
-
capture_error('Yajl', $obj, 'encode', 'parse') { |o| Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
|
90
|
-
capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o| JSON.generator = JSON::Ext::Generator; JSON::Ext::Parser.new(JSON.generate(o)).parse }
|
91
|
-
|
92
|
-
if $verbose
|
93
|
-
puts "json:\n#{$json}\n"
|
94
|
-
end
|
95
|
-
|
96
|
-
|
97
|
-
puts '-' * 80
|
98
|
-
puts "Parse Performance"
|
99
|
-
perf = Perf.new()
|
100
|
-
perf.add('Oj::Saj', 'all') { Oj.saj_parse(saj_handler, $json) }
|
101
|
-
perf.add('Oj::Saj', 'none') { Oj.saj_parse(no_saj, $json) }
|
102
|
-
perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) } unless $failed.has_key?('Yajl')
|
103
|
-
perf.add('JSON::Ext', 'parse') { JSON::Ext::Parser.new($json).parse } unless $failed.has_key?('JSON::Ext')
|
104
|
-
perf.run($iter)
|
105
|
-
|
106
|
-
unless $failed.empty?
|
107
|
-
puts "The following packages were not included for the reason listed"
|
108
|
-
$failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
|
109
|
-
end
|