oj 0.6.0 → 0.7.0

data/ext/oj/oj.h

@@ -45,6 +45,8 @@ extern "C" {
 #include "ruby/encoding.h"
 #endif
 
+#include "cache.h"
+
 #ifdef JRUBY
 #define NO_RSTRUCT 1
 #endif
@@ -90,12 +92,20 @@ extern void	_oj_raise_error(const char *msg, const char *xml, const char *curren
 
 extern VALUE    Oj;
 
+extern VALUE	oj_time_class;
+
+extern ID	oj_at_id;
 extern ID	oj_instance_variables_id;
 extern ID	oj_to_hash_id;
 extern ID	oj_to_json_id;
+extern ID	oj_to_sym_id;
+extern ID	oj_tv_nsec_id;
 extern ID	oj_tv_sec_id;
 extern ID	oj_tv_usec_id;
 
+extern Cache    oj_class_cache;
+extern Cache    oj_attr_cache;
+
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */

data/lib/oj/version.rb

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

data/test/files.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby -wW2
+
+if $0 == __FILE__
+  $: << '.'
+  $: << '..'
+  $: << '../lib'
+  $: << '../ext'
+end
+
+require 'pp'
+require 'sample/file'
+require 'sample/dir'
+
+def files(dir)
+  d = ::Sample::Dir.new(dir)
+  Dir.new(dir).each do |fn|
+    next if fn.start_with?('.')
+    filename = File.join(dir, fn)
+    #filename = '.' == dir ? fn : File.join(dir, fn)
+    if File.directory?(filename)
+      d << files(filename)
+    else
+      d << ::Sample::File.new(filename)
+    end
+  end
+  #pp d
+  d
+end
+

data/test/perf.rb

@@ -0,0 +1,106 @@
+
+class Perf
+
+  def initialize()
+    @items = []
+  end
+
+  def add(title, op, &blk)
+    @items << Item.new(title, op, &blk)
+  end
+
+  def before(title, &blk)
+    @items.each do |i|
+      if title == i.title
+        i.set_before(&blk)
+        break
+      end
+    end
+  end
+  
+  def run(iter)
+    base = Item.new(nil, nil) { }
+    base.run(iter, 0.0)
+    @items.each do |i|
+      i.run(iter, base.duration)
+      if i.error.nil?
+        puts "#{i.title}.#{i.op} #{iter} times in %0.3f seconds or %0.3f #{i.op}/sec." % [i.duration, iter / i.duration]
+      else
+        puts "***** #{i.title}.#{i.op} failed! #{i.error}"
+      end
+    end
+    summary()
+  end
+
+  def summary()
+    fastest = nil
+    slowest = nil
+    width = 6
+    @items.each do |i|
+      next if i.duration.nil?
+      width = i.title.size if width < i.title.size
+    end
+    iva = @items.clone
+    iva.delete_if { |i| i.duration.nil? }
+    iva.sort_by! { |i| i.duration }
+    puts
+    puts "Summary:"
+    puts "%*s  time (secs)  rate (ops/sec)" % [width, 'System']
+    puts "#{'-' * width}  -----------  --------------"
+    iva.each do |i|
+      if i.duration.nil?
+      else
+        puts "%*s %11.3f  %14.3f" % [width, i.title, i.duration, i.rate ]
+      end
+    end
+    puts
+    puts "Comparison Matrix\n(performance factor, 2.0 row is means twice as fast as column)"
+    puts ([' ' * width] + iva.map { |i| "%*s" % [width, i.title] }).join('  ')
+    puts (['-' * width] + iva.map { |i| '-' * width }).join('  ')
+    iva.each do |i|
+      line = ["%*s" % [width, i.title]]
+      iva.each do |o|
+        line << "%*.2f" % [width, o.duration / i.duration]
+      end
+      puts line.join('  ')
+    end
+    puts
+  end
+
+  class Item
+    attr_accessor :title
+    attr_accessor :op
+    attr_accessor :blk
+    attr_accessor :duration
+    attr_accessor :rate
+    attr_accessor :error
+
+    def initialize(title, op, &blk)
+      @title = title
+      @blk = blk
+      @op = op
+      @duration = nil
+      @rate = nil
+      @error = nil
+      @before = nil
+    end
+
+    def set_before(&blk)
+      @before = blk
+    end
+
+    def run(iter, base)
+      begin
+        @before.call unless @before.nil?
+        start = Time.now
+        iter.times { @blk.call }
+        @duration = Time.now - start - base
+        @duration = 0.0 if @duration < 0.0
+        @rate = iter / @duration
+      rescue Exception => e
+        @error = "#{e.class}: #{e.message}"
+      end
+    end
+
+  end # Item
+end # Perf

data/test/perf_obj.rb

@@ -0,0 +1,124 @@
+#!/usr/bin/env ruby -wW1
+
+$: << '.'
+$: << '../lib'
+$: << '../ext'
+
+if __FILE__ == $0
+  if (i = ARGV.index('-I'))
+    x,path = ARGV.slice!(i, 2)
+    $: << path
+  end
+end
+
+require 'optparse'
+require 'ox'
+require 'oj'
+require 'perf'
+require 'sample'
+require 'files'
+
+$circular = false
+$indent = 0
+
+do_sample = false
+do_files = false
+
+do_load = false
+do_dump = false
+do_read = false
+do_write = false
+$iter = 1000
+
+opts = OptionParser.new
+opts.on("-c", "circular options")                           { $circular = true }
+
+opts.on("-s", "load and dump as sample Ruby object")        { do_sample = true }
+opts.on("-f", "load and dump as files Ruby object")         { do_files = true }
+
+opts.on("-l", "load")                                       { do_load = true }
+opts.on("-d", "dump")                                       { do_dump = true }
+opts.on("-r", "read")                                       { do_read = true }
+opts.on("-w", "write")                                      { do_write = true }
+opts.on("-a", "load, dump, read and write")                 { do_load = true; do_dump = true; do_read = true; do_write = true }
+
+opts.on("-i", "--iterations [Int]", Integer, "iterations")  { |i| $iter = i }
+
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+$obj = nil
+$xml = nil
+$mars = nil
+$json = nil
+
+unless do_load || do_dump || do_read || do_write
+  do_load = true
+  do_dump = true
+  do_read = true
+  do_write = true
+end
+
+# prepare all the formats for input
+if files.empty?
+  $obj = do_sample ? sample_doc(2) : files('..')
+  $mars = Marshal.dump($obj)
+  $xml = Ox.dump($obj, :indent => $indent, circular: $circular)
+  $json = Oj.dump($obj, :indent => $indent, circular: $circular)
+  File.open('sample.xml', 'w') { |f| f.write($xml) }
+  File.open('sample.json', 'w') { |f| f.write($json) }
+  File.open('sample.marshal', 'w') { |f| f.write($mars) }
+else
+  puts "loading and parsing #{files}\n\n"
+  # TBD change to allow xml and json
+  data = files.map do |f|
+    $xml = File.read(f)
+    $obj = Ox.load($xml);
+    $mars = Marshal.dump($obj)
+    $json = Oj.dump($obj, :indent => $indent, circular: $circular)
+  end
+end
+
+Oj.default_options = { :mode => :object, :indent => $indent }
+
+if do_load
+  puts '-' * 80
+  puts "Load Performance"
+  perf = Perf.new()
+  perf.add('Ox', 'load') { Ox.load($xml, :mode => :object) }
+  perf.add('Oj', 'load') { Oj.load($json) }
+  perf.add('Marshal', 'load') { Marshal.load($mars) }
+  perf.run($iter)
+end
+
+if do_dump
+  puts '-' * 80
+  puts "Dump Performance"
+  perf = Perf.new()
+  perf.add('Ox', 'dump') { Ox.dump($obj, :indent => $indent, :circular => $circular) }
+  perf.add('Oj', 'dump') { Oj.dump($obj) }
+  perf.add('Marshal', 'dump') { Marshal.dump($obj) }
+  perf.run($iter)
+end
+
+if do_read
+  puts '-' * 80
+  puts "Read from file Performance"
+  perf = Perf.new()
+  perf.add('Ox', 'load_file') { Ox.load_file('sample.xml', :mode => :object) }
+  perf.add('Oj', 'load') { Oj.load_file('sample.json') }
+  perf.add('Marshal', 'load') { Marshal.load(File.new('sample.marshal')) }
+  perf.run($iter)
+end
+
+if do_write
+  puts '-' * 80
+  puts "Write to file Performance"
+  perf = Perf.new()
+  perf.add('Ox', 'to_file') { Ox.to_file('sample.xml', $obj, :indent => $indent, :circular => $circular) }
+  perf.add('Oj', 'to_file') { Oj.to_file('sample.json', $obj) }
+  perf.add('Marshal', 'dump') { Marshal.dump($obj, File.new('sample.marshal', 'w')) }
+  perf.run($iter)
+end
+
+

data/test/perf_strict.rb

@@ -0,0 +1,131 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'optparse'
+require 'yajl'
+require 'perf'
+require 'json'
+require 'json/pure'
+require 'json/ext'
+require 'msgpack'
+require 'oj'
+require 'ox'
+
+class Jazz
+  def initialize()
+    @boolean = true
+    @number = 58
+    @string = "A string"
+    @array = [true, false, nil]
+    @hash = { 'one' => 1, 'two' => 2 }
+  end
+  def to_json(*) # Yajl and JSON have different signatures
+    %{
+    { "boolean":#{@boolean},
+      "number":#{@number},
+      "string":#{@string},
+      "array":#{@array},
+      "hash":#{@hash},
+    }
+}
+  end
+  def to_hash()
+    { 'boolean' => @boolean,
+      'number' => @number,
+      'string' => @string,
+      'array' => @array,
+      'hash' => @hash,
+    }
+  end
+  def to_msgpack(out)
+    out << MessagePack.pack(to_hash())
+  end
+end
+
+$indent = 0
+$iter = 100000
+$with_object = true
+$with_bignum = true
+$with_nums = true
+
+opts = OptionParser.new
+opts.on("-c", "--count [Int]", Integer, "iterations")       { |i| $iter = i }
+opts.on("-i", "--indent [Int]", Integer, "indentation")     { |i| $indent = i }
+opts.on("-o", "without objects")                            { $with_object = false }
+opts.on("-b", "without bignum")                             { $with_bignum = false }
+opts.on("-n", "without numbers")                            { $with_nums = false }
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+if $with_nums
+  $obj = {
+    'a' => 'Alpha',
+    'b' => true,
+    'c' => 12345,
+    'd' => [ true, [false, [12345, nil], 3.967, ['something', false], nil]],
+    'e' => { 'one' => 1, 'two' => 2 },
+    'f' => nil,
+  }
+  $obj['g'] = Jazz.new() if $with_object
+  $obj['h'] = 12345678901234567890123456789 if $with_bignum
+else
+  $obj = {
+    'a' => 'Alpha',
+    'b' => true,
+    'c' => '12345',
+    'd' => [ true, [false, ['12345', nil], '3.967', ['something', false], nil]],
+    'e' => { 'one' => '1', 'two' => '2' },
+    'f' => nil,
+  }
+end
+
+Oj.default_options = { :indent => $indent, :mode => :compat }
+Ox.default_options = { :indent => $indent, :mode => :object }
+
+$json = Oj.dump($obj)
+$xml = Ox.dump($obj, :indent => $indent)
+begin
+  $msgpack = MessagePack.pack($obj)
+rescue Exception => e
+  puts "MessagePack failed to pack! #{e.class}: #{e.message}.\nSkipping."
+  $msgpack = nil
+end
+
+puts '-' * 80
+puts "Load/Parse Performance"
+perf = Perf.new()
+perf.add('Oj', 'load') { Oj.load($json) }
+perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) }
+perf.add('JSON::Ext', 'parse') { JSON::Ext::Parser.new($json).parse }
+perf.add('JSON::Pure', 'parse') { JSON::Pure::Parser.new($json).parse }
+perf.add('Ox', 'load') { Ox.load($xml) }
+perf.add('MessagePack', 'unpack') { MessagePack.unpack($msgpack) } unless $msgpack.nil?
+perf.run($iter)
+
+puts
+puts '-' * 80
+puts "Dump/Encode/Generate Performance"
+perf = Perf.new()
+perf.add('Oj', 'dump') { Oj.dump($obj) }
+perf.add('Yajl', 'encode') { Yajl::Encoder.encode($obj) }
+if 0 == $indent
+  perf.add('JSON::Ext', 'generate') { JSON.generate($obj) }
+else
+  perf.add('JSON::Ext', 'generate') { JSON.pretty_generate($obj) }
+end
+perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
+if 0 == $indent
+  perf.add('JSON::Pure', 'generate') { JSON.generate($obj) }
+else
+  perf.add('JSON::Pure', 'generate') { JSON.pretty_generate($obj) }
+end
+perf.before('JSON::Pure') { JSON.generator = JSON::Pure::Generator }
+perf.add('Ox', 'dump') { Ox.dump($obj) }
+perf.add('MessagePack', 'pack') { MessagePack.pack($obj) } unless $msgpack.nil?
+perf.run($iter)
+
+puts

data/test/sample.rb

@@ -8,30 +8,48 @@ if $0 == __FILE__
 end
 
 require 'pp'
-require 'oj'
+require 'sample/doc'
 
-def sample_json(size=3)
+
+def sample_doc(size=3)
   colors = [ :black, :gray, :white, :red, :blue, :yellow, :green, :purple, :orange ]
-  container = []
-  size.times do |i|
-    box = {
-      'color' => colors[i % colors.size],
-      'fragile' => (0 == (i % 2)),
-      'width' => i,
-      'height' => i,
-      'depth' => i,
-      'weight' => i * 1.3,
-      'address' => {
-        'street' => "#{i} Main Street",
-        'city' => 'Sity',
-        'state' => nil
-      }
-    }
-    container << box
+
+  d = ::Sample::Doc.new('Sample')
+
+  # add some history
+  (0..size * 10).each do |i|
+    d.add_change("Changed at t+#{i}.")
   end
-  container
-end
 
-if $0 == __FILE__
-  File.open('sample.json', "w") { |f| f.write(Oj.dump(sample_json(3), :indent => 2)) }
+  # add some layers
+  (1..size).each do |i|
+    layer = ::Sample::Layer.new("Layer-#{i}")
+    (1..size).each do |j|
+      g = ::Sample::Group.new
+      (1..size).each do |k|
+        g2 = ::Sample::Group.new
+        r = ::Sample::Rect.new(j * 40 + 10.0, i * 10.0,
+                                 10.123456 / k, 10.0 / k, colors[(i + j + k) % colors.size])
+        r.add_prop(:part_of, layer.name)
+        g2 << r
+        g2 << ::Sample::Text.new("#{k} in #{j}", r.left, r.top, r.width, r.height)
+        g << g2
+      end
+      g2 = ::Sample::Group.new
+      (1..size).each do |k|
+        o = ::Sample::Oval.new(j * 40 + 12.0, i * 10.0 + 2.0,
+                                 6.0 / k, 6.0 / k, colors[(i + j + k) % colors.size])
+        o.add_prop(:inside, true)
+        g << o
+      end
+      g << g2
+      layer << g
+    end
+    d.layers[layer.name] = layer
+  end
+
+  # some properties
+  d.add_prop(:purpose, 'an example')
+
+  d
 end