oj 2.0.9 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d381fbfd7fb7f6a4db7b5a0352dc56e247ff558
-  data.tar.gz: f4bc74121936f923cc619bf6bc8a266489eb16e1
+  metadata.gz: 027c673b279c8afd3bfe19993fd495522b7e7193
+  data.tar.gz: a007b49197ff05ebfa1de0b6f154cd9dbbaac632
 SHA512:
-  metadata.gz: e1635008e3c52a9b9ed5cbe3b926acac6f5391fa0d894d93d68f1d0dcec5e0904e1cd216ec072eca857ae33d8df3fd32fd4068102626ec87bd724c3cfc9302fc
-  data.tar.gz: 68c45999557700cd5e65cf4c55d4d0da0fa227bc8c5c0c838b6430cc37cb2475d3f2f3a548c4abb9b23130cc44bb9f918a1ee6a8b957133ee072eaab36254be0
+  metadata.gz: 8a391978b9e3bd73832878cf081a532814b1ed7cb7e4ca1c6279f63d15326715c28759992eddb4e224dc59f5804957bf5c88c35b38efa6f19f810a2f68b5b0ae
+  data.tar.gz: c5db0d98e3d96cb0c2ffa0e4fe57d5cd017a38d3d991f45487669f0d86dfcbfca5f275da220dafe5622dc3467ce614f9060c1dc9cf5c7d744f153d415cd2366e

data/README.md

@@ -32,20 +32,15 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 2.0.9
-
- - Fixed problem with INFINITY with CentOS and Ruby 2.0.0. There are some header file conflicts so a different INFINITY was used.
+### Release 2.0.10
 
-### Release 2.0.8
+ - Tweaked dump calls by reducing preallocation. Speeds are now several times faster for smaller objects.
 
- - Added :bigdecimal_load option that forces all decimals in a JSON string to be read as BigDecimals instead of as
-   Floats. This is useful if precision is important.
+ - Fixed Windows compile error with Ruby 2.0.0.
 
- - Worked around bug in active_support 2.3.x where BigDecimal.as_json() returned self instead of a JSON primitive. Of
-   course that creates a loop and blows the stack. Oj ignores the as_json() for any object that returns itself and
-   instead encodes the object as it sees fit which is usually what is expected.
+### Release 2.0.9
 
- - All tests pass with Ruby 2.0.0-p0. Had to modify Exception encoding slightly.
+ - Fixed problem with INFINITY with CentOS and Ruby 2.0.0. There are some header file conflicts so a different INFINITY was used.
 
 ## <a name="description">Description</a>
 

data/ext/oj/dump.c

@@ -50,19 +50,6 @@
 
 typedef unsigned long	ulong;
 
-typedef struct _Out {
-    char	*buf;
-    char	*end;
-    char	*cur;
-    Cache8	circ_cache;
-    slot_t	circ_cnt;
-    int		indent;
-    int		depth; // used by dump_hash
-    Options	opts;
-    uint32_t	hash_cnt;
-} *Out;
-
-static void	dump_obj_to_json(VALUE obj, Options copts, Out out);
 static void	raise_strict(VALUE obj);
 static void	dump_val(VALUE obj, int depth, Out out);
 static void	dump_nil(Out out);
@@ -108,7 +95,6 @@ static void	grow(Out out, size_t len);
 static size_t	hibit_friendly_size(const uint8_t *str, size_t len);
 static size_t	ascii_friendly_size(const uint8_t *str, size_t len);
 
-static void	dump_leaf_to_json(Leaf leaf, Options copts, Out out);
 static void	dump_leaf(Leaf leaf, int depth, Out out);
 static void	dump_leaf_str(Leaf leaf, Out out);
 static void	dump_leaf_fixnum(Leaf leaf, Out out);
@@ -215,8 +201,14 @@ grow(Out out, size_t len) {
     if (size <= len * 2 + pos) {
 	size += len;
     }
-    buf = REALLOC_N(out->buf, char, (size + 10));
-    if (0 == buf) { // 1 extra for terminator character plus extra (paranoid)
+    if (out->allocated) {
+	buf = REALLOC_N(out->buf, char, (size + 10));
+    } else {
+	buf = ALLOC_N(char, (size + 10));
+	out->allocated = 1;
+	memcpy(buf, out->buf, out->end - out->buf);
+    }
+    if (0 == buf) {
 	rb_raise(rb_eNoMemError, "Failed to create string. [%d:%s]\n", ENOSPC, strerror(ENOSPC));
     }
     out->buf = buf;
@@ -1650,10 +1642,13 @@ dump_val(VALUE obj, int depth, Out out) {
     }
 }
 
-static void
-dump_obj_to_json(VALUE obj, Options copts, Out out) {
-    out->buf = ALLOC_N(char, 65336);
-    out->end = out->buf + 65325; // 1 less than end plus extra for possible errors
+void
+oj_dump_obj_to_json(VALUE obj, Options copts, Out out) {
+    if (0 == out->buf) {
+	out->buf = ALLOC_N(char, 4096);
+	out->end = out->buf + 4085; // 1 less than end plus extra for possible errors
+	out->allocated = 1;
+    }
     out->cur = out->buf;
     out->circ_cnt = 0;
     out->opts = copts;
@@ -1668,22 +1663,17 @@ dump_obj_to_json(VALUE obj, Options copts, Out out) {
     }
 }
 
-char*
-oj_write_obj_to_str(VALUE obj, Options copts) {
-    struct _Out out;
-
-    dump_obj_to_json(obj, copts, &out);
-
-    return out.buf;
-}
-
 void
 oj_write_obj_to_file(VALUE obj, const char *path, Options copts) {
+    char	buf[4096];
     struct _Out out;
     size_t	size;
     FILE	*f;
 
-    dump_obj_to_json(obj, copts, &out);
+    out.buf = buf;
+    out.end = buf + sizeof(buf) - 10;
+    out.allocated = 0;
+    oj_dump_obj_to_json(obj, copts, &out);
     size = out.cur - out.buf;
     if (0 == (f = fopen(path, "w"))) {
 	rb_raise(rb_eIOError, "%s\n", strerror(errno));
@@ -1693,7 +1683,9 @@ oj_write_obj_to_file(VALUE obj, const char *path, Options copts) {
 
 	rb_raise(rb_eIOError, "Write failed. [%d:%s]\n", err, strerror(err));
     }
-    xfree(out.buf);
+    if (out.allocated) {
+	xfree(out.buf);
+    }
     fclose(f);
 }
 
@@ -1872,10 +1864,13 @@ dump_leaf(Leaf leaf, int depth, Out out) {
     }
 }
 
-static void
-dump_leaf_to_json(Leaf leaf, Options copts, Out out) {
-    out->buf = ALLOC_N(char, 65336);
-    out->end = out->buf + 65325; // 10 less than end plus extra for possible errors
+void
+oj_dump_leaf_to_json(Leaf leaf, Options copts, Out out) {
+    if (0 == out->buf) {
+	out->buf = ALLOC_N(char, 4096);
+	out->end = out->buf + 4085; // 1 less than end plus extra for possible errors
+	out->allocated = 1;
+    }
     out->cur = out->buf;
     out->circ_cnt = 0;
     out->opts = copts;
@@ -1884,22 +1879,17 @@ dump_leaf_to_json(Leaf leaf, Options copts, Out out) {
     dump_leaf(leaf, 0, out);
 }
 
-char*
-oj_write_leaf_to_str(Leaf leaf, Options copts) {
-    struct _Out out;
-
-    dump_leaf_to_json(leaf, copts, &out);
-
-    return out.buf;
-}
-
 void
 oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts) {
+    char	buf[4096];
     struct _Out out;
     size_t	size;
     FILE	*f;
 
-    dump_leaf_to_json(leaf, copts, &out);
+    out.buf = buf;
+    out.end = buf + sizeof(buf) - 10;
+    out.allocated = 0;
+    oj_dump_leaf_to_json(leaf, copts, &out);
     size = out.cur - out.buf;
     if (0 == (f = fopen(path, "w"))) {
 	rb_raise(rb_eIOError, "%s\n", strerror(errno));
@@ -1909,6 +1899,8 @@ oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts) {
 
 	rb_raise(rb_eIOError, "Write failed. [%d:%s]\n", err, strerror(err));
     }
-    xfree(out.buf);
+    if (out.allocated) {
+	xfree(out.buf);
+    }
     fclose(f);
 }

data/ext/oj/extconf.rb

@@ -20,7 +20,7 @@ dflags = {
   'RUBY_VERSION_MAJOR' => version[0],
   'RUBY_VERSION_MINOR' => version[1],
   'RUBY_VERSION_MICRO' => version[2],
-  'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
+  'HAS_RB_TIME_TIMESPEC' => (!is_windows && 'ruby' == type && ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
   'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type) &&
                              (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
   'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,

data/ext/oj/fast.c

@@ -1571,13 +1571,20 @@ doc_dump(int argc, VALUE *argv, VALUE self) {
 	}
     }
     if (0 != (leaf = get_doc_leaf(doc, path))) {
-	char	*json;
 	VALUE	rjson;
 
 	if (0 == filename) {
-	    json = oj_write_leaf_to_str(leaf, &oj_default_options);
-	    rjson = rb_str_new2(json);
-	    xfree(json);
+	    char	buf[4096];
+	    struct _Out out;
+
+	    out.buf = buf;
+	    out.end = buf + sizeof(buf) - 10;
+	    out.allocated = 0;
+	    oj_dump_leaf_to_json(leaf, &oj_default_options, &out);
+	    rjson = rb_str_new2(out.buf);
+	    if (out.allocated) {
+		xfree(out.buf);
+	    }
 	} else {
 	    oj_write_leaf_to_file(leaf, filename, &oj_default_options);
 	    rjson = Qnil;

data/ext/oj/oj.c

@@ -573,22 +573,28 @@ strict_load(VALUE self, VALUE doc) {
  */
 static VALUE
 dump(int argc, VALUE *argv, VALUE self) {
-    char		*json;
+    char		buf[4096];
+    struct _Out		out;
     struct _Options	copts = oj_default_options;
     VALUE		rstr;
     
     if (2 == argc) {
 	parse_options(argv[1], &copts);
     }
-    if (0 == (json = oj_write_obj_to_str(*argv, &copts))) {
+    out.buf = buf;
+    out.end = buf + sizeof(buf) - 10;
+    out.allocated = 0;
+    oj_dump_obj_to_json(*argv, &copts, &out);
+    if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }
-    rstr = rb_str_new2(json);
+    rstr = rb_str_new2(out.buf);
 #if HAS_ENCODING_SUPPORT
     rb_enc_associate(rstr, oj_utf8_encoding);
 #endif
-    xfree(json);
-
+    if (out.allocated) {
+	xfree(out.buf);
+    }
     return rstr;
 }
 
@@ -698,14 +704,19 @@ saj_parse(int argc, VALUE *argv, VALUE self) {
 
 static VALUE
 mimic_dump(int argc, VALUE *argv, VALUE self) {
-    char		*json;
+    char		buf[4096];
+    struct _Out		out;
     struct _Options	copts = oj_default_options;
     VALUE		rstr;
     
-    if (0 == (json = oj_write_obj_to_str(*argv, &copts))) {
+    out.buf = buf;
+    out.end = buf + sizeof(buf) - 10;
+    out.allocated = 0;
+    oj_dump_obj_to_json(*argv, &copts, &out);
+    if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }
-    rstr = rb_str_new2(json);
+    rstr = rb_str_new2(out.buf);
 #if HAS_ENCODING_SUPPORT
     rb_enc_associate(rstr, oj_utf8_encoding);
 #endif
@@ -717,8 +728,9 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
 	rb_funcall2(io, oj_write_id, 1, args);
 	rstr = io;
     }
-    xfree(json);
-
+    if (out.allocated) {
+	xfree(out.buf);
+    }
     return rstr;
 }
 
@@ -786,9 +798,13 @@ mimic_dump_load(int argc, VALUE *argv, VALUE self) {
 
 static VALUE
 mimic_generate_core(int argc, VALUE *argv, Options copts) {
-    char		*json;
-    VALUE		rstr;
+    char	buf[4096];
+    struct _Out	out;
+    VALUE	rstr;
     
+    out.buf = buf;
+    out.end = buf + sizeof(buf) - 10;
+    out.allocated = 0;
     if (2 == argc && Qnil != argv[1]) {
 	struct _DumpOpts	dump_opts;
 	VALUE			ropts = argv[1];
@@ -841,15 +857,17 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
 	// :allow_nan is not supported as Oj always allows_nan
 	// :max_nesting is always set to 100
     }
-    if (0 == (json = oj_write_obj_to_str(*argv, copts))) {
+    oj_dump_obj_to_json(*argv, copts, &out);
+    if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }
-    rstr = rb_str_new2(json);
+    rstr = rb_str_new2(out.buf);
 #if HAS_ENCODING_SUPPORT
     rb_enc_associate(rstr, oj_utf8_encoding);
 #endif
-    xfree(json);
-
+    if (out.allocated) {
+	xfree(out.buf);
+    }
     return rstr;
 }
 

data/ext/oj/oj.h

@@ -50,6 +50,7 @@ extern "C" {
 #include <pthread.h>
 #endif
 #include "cache.h"
+#include "cache8.h"
 
 #ifdef RUBINIUS_RUBY
 #undef T_RATIONAL
@@ -116,6 +117,19 @@ typedef struct _Options {
     DumpOpts	dump_opts;
 } *Options;
 
+typedef struct _Out {
+    char	*buf;
+    char	*end;
+    char	*cur;
+    Cache8	circ_cache;
+    slot_t	circ_cnt;
+    int		indent;
+    int		depth; // used by dump_hash
+    Options	opts;
+    uint32_t	hash_cnt;
+    int		allocated;
+} *Out;
+
 typedef struct _Odd {
     VALUE	clas;			// Ruby class
     VALUE	create_obj;
@@ -149,9 +163,9 @@ typedef struct _Leaf {
 extern VALUE	oj_parse(char *json, Options options);
 extern void	oj_saj_parse(VALUE handler, char *json);
 
-extern char*	oj_write_obj_to_str(VALUE obj, Options copts);
+extern void	oj_dump_obj_to_json(VALUE obj, Options copts, Out out);
 extern void	oj_write_obj_to_file(VALUE obj, const char *path, Options copts);
-extern char*	oj_write_leaf_to_str(Leaf leaf, Options copts);
+extern void	oj_dump_leaf_to_json(Leaf leaf, Options copts, Out out);
 extern void	oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts);
 
 extern void	_oj_raise_error(const char *msg, const char *xml, const char *current, const char* file, int line);

data/lib/oj/version.rb

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

data/test/mj.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+# $: << File.join(File.dirname(__FILE__), "../../multi_json/lib")
+
+require 'multi_json'
+require 'benchmark'
+require 'yajl'
+require 'json'
+require 'oj'
+
+iter = 1_000_000
+iter = 100_000
+
+json = %({"k1":"val1","k2":"val2","k3":"val3"})
+obj = { k1: "val1", k2: "val2", k3: "val3" }
+
+puts "Benchmarks for different JSON handlers with MultiJson."
+puts "  Ruby #{RUBY_VERSION}"
+puts "  #{iter} iterations"
+
+MultiJson.engine = :oj
+dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
+et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
+puts "    Oj decode: #{dt}  encode: #{et}"
+
+MultiJson.engine = :yajl
+dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
+et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
+puts "  Yajl decode: #{dt}  encode: #{et}"
+
+MultiJson.engine = :json_gem
+dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
+et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
+puts "  Json decode: #{dt}  encode: #{et}"
+
+Oj.default_options = { :mode => :compat, :time_format => :ruby }
+dt = Benchmark.realtime { iter.times { Oj.load(json) }}
+et = Benchmark.realtime { iter.times { Oj.dump(obj) }}
+puts "Raw Oj decode: #{dt}  encode: #{et}"
+
+ye = Yajl::Encoder.new
+dt = Benchmark.realtime { iter.times { Yajl::Parser.parse(json) }}
+et = Benchmark.realtime { iter.times { Yajl::Encoder.encode(obj) }}
+e2 = Benchmark.realtime { iter.times { ye.encode(obj) }}
+puts "Raw Yajl decode: #{dt} encode: #{et}, encoder: #{e2}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -39,6 +39,7 @@ files:
 - test/a.rb
 - test/bug.rb
 - test/files.rb
+- test/mj.rb
 - test/perf.rb
 - test/perf1.rb
 - test/perf2.rb