oj 3.11.8 → 3.12.3

data/ext/oj/object.c

@@ -30,11 +30,38 @@ inline static long read_long(const char *str, size_t len) {
 
 static VALUE calc_hash_key(ParseInfo pi, Val kval, char k1) {
     volatile VALUE rkey;
+#if 0
+    VALUE *slot;
 
+    if (':' == k1) {
+        if (Qnil == (rkey = oj_sym_hash_get(kval->key + 1, kval->klen - 1, &slot))) {
+            rkey  = rb_str_new(kval->key + 1, kval->klen - 1);
+            rkey  = oj_encode(rkey);
+            rkey  = rb_str_intern(rkey);
+            *slot = rkey;
+            rb_gc_register_address(slot);
+        }
+    } else if (Yes == pi->options.sym_key) {
+        if (Qnil == (rkey = oj_sym_hash_get(kval->key, kval->klen, &slot))) {
+            rkey  = rb_str_new(kval->key, kval->klen);
+            rkey  = oj_encode(rkey);
+            rkey  = rb_str_intern(rkey);
+            *slot = rkey;
+            rb_gc_register_address(slot);
+        }
+    } else {
+        if (Qnil == (rkey = oj_str_hash_get(kval->key, kval->klen, &slot))) {
+            rkey  = rb_str_new(kval->key, kval->klen);
+            rkey  = oj_encode(rkey);
+            *slot = rkey;
+            rb_gc_register_address(slot);
+        }
+    }
+#else
     if (':' == k1) {
         rkey = rb_str_new(kval->key + 1, kval->klen - 1);
         rkey = oj_encode(rkey);
-        rkey = rb_funcall(rkey, oj_to_sym_id, 0);
+	rkey  = rb_str_intern(rkey);
     } else {
         rkey = rb_str_new(kval->key, kval->klen);
         rkey = oj_encode(rkey);
@@ -42,6 +69,7 @@ static VALUE calc_hash_key(ParseInfo pi, Val kval, char k1) {
             rkey = rb_str_intern(rkey);
         }
     }
+#endif
     return rkey;
 }
 
@@ -405,22 +433,22 @@ void oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
             char *buf = ALLOC_N(char, klen + 2);
 
             if ('~' == *key) {
-                strncpy(buf, key + 1, klen - 1);
+                memcpy(buf, key + 1, klen - 1);
                 buf[klen - 1] = '\0';
             } else {
                 *buf = '@';
-                strncpy(buf + 1, key, klen);
+                memcpy(buf + 1, key, klen);
                 buf[klen + 1] = '\0';
             }
             var_id = rb_intern(buf);
             xfree(buf);
         } else {
             if ('~' == *key) {
-                strncpy(attr, key + 1, klen - 1);
+                memcpy(attr, key + 1, klen - 1);
                 attr[klen - 1] = '\0';
             } else {
                 *attr = '@';
-                strncpy(attr + 1, key, klen);
+                memcpy(attr + 1, key, klen);
                 attr[klen + 1] = '\0';
             }
             var_id = rb_intern(attr);

data/ext/oj/oj.c

@@ -40,7 +40,6 @@ ID oj_error_id;
 ID oj_file_id;
 ID oj_fileno_id;
 ID oj_ftype_id;
-ID oj_has_key_id;
 ID oj_hash_end_id;
 ID oj_hash_key_id;
 ID oj_hash_set_id;
@@ -106,6 +105,8 @@ static VALUE auto_sym;
 static VALUE bigdecimal_as_decimal_sym;
 static VALUE bigdecimal_load_sym;
 static VALUE bigdecimal_sym;
+static VALUE cache_keys_sym;
+static VALUE cache_str_sym;
 static VALUE circular_sym;
 static VALUE class_cache_sym;
 static VALUE compat_bigdecimal_sym;
@@ -186,6 +187,8 @@ struct _options oj_default_options = {
     No,             // safe
     false,          // sec_prec_set
     No,             // ignore_under
+    Yes,            // cache_keys
+    3,              // cache_str
     0,              // int_range_min
     0,              // int_range_max
     oj_json_class,  // create_id
@@ -279,9 +282,11 @@ struct _options oj_default_options = {
  *used
  * - *:array_class* [_Class_|_nil_] Class to use instead of Array on load
  * - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil values are omitted
- * - *:ignore* [_nil_|Array] either nil or an Array of classes to ignore when dumping
- * - *:ignore_under* [Boolean] if true then attributes that start with _ are ignored when dumping in
+ * - *:ignore* [_nil_|_Array_] either nil or an Array of classes to ignore when dumping
+ * - *:ignore_under* [_Boolean_] if true then attributes that start with _ are ignored when dumping in
  *object or custom mode.
+ * - *:cache_keys* [_Boolean_] if true then hash keys are cached
+ * - *:cache_str* [_Fixnum_] maximum string value length to cache
  * - *:integer_range* [_Range_] Dump integers outside range as strings.
  * - *:trace* [_true,_|_false_] Trace all load and dump calls, default is false (trace is off)
  * - *:safe* [_true,_|_false_] Safe mimic breaks JSON mimic to be safer, default is false (safe is
@@ -389,11 +394,17 @@ static VALUE get_def_opts(VALUE self) {
                      ? Qtrue
                      : ((No == oj_default_options.safe) ? Qfalse : Qnil));
     rb_hash_aset(opts, float_prec_sym, INT2FIX(oj_default_options.float_prec));
+    rb_hash_aset(opts, cache_str_sym, INT2FIX(oj_default_options.cache_str));
     rb_hash_aset(opts,
                  ignore_under_sym,
                  (Yes == oj_default_options.ignore_under)
                      ? Qtrue
                      : ((No == oj_default_options.ignore_under) ? Qfalse : Qnil));
+    rb_hash_aset(opts,
+                 cache_keys_sym,
+                 (Yes == oj_default_options.cache_keys)
+                     ? Qtrue
+                     : ((No == oj_default_options.cache_keys) ? Qfalse : Qnil));
     switch (oj_default_options.mode) {
     case StrictMode: rb_hash_aset(opts, mode_sym, strict_sym); break;
     case CompatMode: rb_hash_aset(opts, mode_sym, compat_sym); break;
@@ -557,6 +568,8 @@ static VALUE get_def_opts(VALUE self) {
  *   - *:ignore* [_nil_|Array] either nil or an Array of classes to ignore when dumping
  *   - *:ignore_under* [_Boolean_] if true then attributes that start with _ are ignored when
  *dumping in object or custom mode.
+ *   - *:cache_keys* [_Boolean_] if true then hash keys are cached
+ *   - *:cache_str* [_Fixnum_] maximum string vsalue length to cache
  *   - *:integer_range* [_Range_] Dump integers outside range as strings.
  *   - *:trace* [_Boolean_] turn trace on or off.
  *   - *:safe* [_Boolean_] turn safe mimic on or off.
@@ -568,6 +581,14 @@ static VALUE set_def_opts(VALUE self, VALUE opts) {
     return Qnil;
 }
 
+bool oj_hash_has_key(VALUE hash, VALUE key)
+{
+    if (Qundef == rb_hash_lookup2(hash, key, Qundef)) {
+        return false;
+    }
+    return true;
+}
+
 void oj_parse_options(VALUE ropts, Options copts) {
     struct _yesNoOpt ynos[] = {{circular_sym, &copts->circular},
                                {auto_define_sym, &copts->auto_define},
@@ -589,6 +610,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
                                {oj_safe_sym, &copts->safe},
                                {ignore_under_sym, &copts->ignore_under},
                                {oj_create_additions_sym, &copts->create_ok},
+                               {cache_keys_sym, &copts->cache_keys},
                                {Qnil, 0}};
     YesNoOpt         o;
     volatile VALUE   v;
@@ -597,7 +619,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
     if (T_HASH != rb_type(ropts)) {
         return;
     }
-    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_indent_sym)) {
+    if (oj_hash_has_key(ropts, oj_indent_sym)) {
         v = rb_hash_lookup(ropts, oj_indent_sym);
         switch (rb_type(v)) {
         case T_NIL:
@@ -647,6 +669,28 @@ void oj_parse_options(VALUE ropts, Options copts) {
             copts->float_prec = n;
         }
     }
+    if (Qnil != (v = rb_hash_lookup(ropts, cache_str_sym))) {
+        int n;
+
+#ifdef RUBY_INTEGER_UNIFICATION
+        if (rb_cInteger != rb_obj_class(v)) {
+            rb_raise(rb_eArgError, ":cache_str must be a Integer.");
+        }
+#else
+        if (T_FIXNUM != rb_type(v)) {
+            rb_raise(rb_eArgError, ":cache_str must be a Fixnum.");
+        }
+#endif
+        n = FIX2INT(v);
+        if (0 >= n) {
+            copts->cache_str = 0;
+        } else {
+            if (32 < n) {
+                n = 32;
+            }
+            copts->cache_str = (char)n;
+        }
+    }
     if (Qnil != (v = rb_hash_lookup(ropts, sec_prec_sym))) {
         int n;
 
@@ -736,7 +780,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
     if (Qnil != (v = rb_hash_lookup(ropts, compat_bigdecimal_sym))) {
         copts->compat_bigdec = (Qtrue == v);
     }
-    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_decimal_class_sym)) {
+    if (oj_hash_has_key(ropts, oj_decimal_class_sym)) {
         v = rb_hash_lookup(ropts, oj_decimal_class_sym);
         if (rb_cFloat == v) {
             copts->compat_bigdec = false;
@@ -746,7 +790,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
             rb_raise(rb_eArgError, ":decimal_class must be BigDecimal or Float.");
         }
     }
-    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, create_id_sym)) {
+    if (oj_hash_has_key(ropts, create_id_sym)) {
         v = rb_hash_lookup(ropts, create_id_sym);
         if (Qnil == v) {
             if (oj_json_class != oj_default_options.create_id && NULL != copts->create_id) {
@@ -768,7 +812,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
         }
     }
     for (o = ynos; 0 != o->attr; o++) {
-        if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, o->sym)) {
+        if (oj_hash_has_key(ropts, o->sym)) {
             v = rb_hash_lookup(ropts, o->sym);
             if (Qnil == v) {
                 *o->attr = NotSet;
@@ -783,7 +827,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
             }
         }
     }
-    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_space_sym)) {
+    if (oj_hash_has_key(ropts, oj_space_sym)) {
         if (Qnil == (v = rb_hash_lookup(ropts, oj_space_sym))) {
             copts->dump_opts.after_size = 0;
             *copts->dump_opts.after_sep = '\0';
@@ -798,7 +842,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
             copts->dump_opts.after_size = (uint8_t)len;
         }
     }
-    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_space_before_sym)) {
+    if (oj_hash_has_key(ropts, oj_space_before_sym)) {
         if (Qnil == (v = rb_hash_lookup(ropts, oj_space_before_sym))) {
             copts->dump_opts.before_size = 0;
             *copts->dump_opts.before_sep = '\0';
@@ -813,7 +857,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
             copts->dump_opts.before_size = (uint8_t)len;
         }
     }
-    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_object_nl_sym)) {
+    if (oj_hash_has_key(ropts, oj_object_nl_sym)) {
         if (Qnil == (v = rb_hash_lookup(ropts, oj_object_nl_sym))) {
             copts->dump_opts.hash_size = 0;
             *copts->dump_opts.hash_nl  = '\0';
@@ -828,7 +872,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
             copts->dump_opts.hash_size = (uint8_t)len;
         }
     }
-    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_array_nl_sym)) {
+    if (oj_hash_has_key(ropts, oj_array_nl_sym)) {
         if (Qnil == (v = rb_hash_lookup(ropts, oj_array_nl_sym))) {
             copts->dump_opts.array_size = 0;
             *copts->dump_opts.array_nl  = '\0';
@@ -877,7 +921,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
     } else if (Qfalse == v) {
         copts->escape_mode = JSONEsc;
     }
-    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_hash_class_sym)) {
+    if (oj_hash_has_key(ropts, oj_hash_class_sym)) {
         if (Qnil == (v = rb_hash_lookup(ropts, oj_hash_class_sym))) {
             copts->hash_class = Qnil;
         } else {
@@ -885,7 +929,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
             copts->hash_class = v;
         }
     }
-    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_object_class_sym)) {
+    if (oj_hash_has_key(ropts, oj_object_class_sym)) {
         if (Qnil == (v = rb_hash_lookup(ropts, oj_object_class_sym))) {
             copts->hash_class = Qnil;
         } else {
@@ -893,7 +937,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
             copts->hash_class = v;
         }
     }
-    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_array_class_sym)) {
+    if (oj_hash_has_key(ropts, oj_array_class_sym)) {
         if (Qnil == (v = rb_hash_lookup(ropts, oj_array_class_sym))) {
             copts->array_class = Qnil;
         } else {
@@ -902,7 +946,7 @@ void oj_parse_options(VALUE ropts, Options copts) {
         }
     }
     oj_parse_opt_match_string(&copts->str_rx, ropts);
-    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, ignore_sym)) {
+    if (oj_hash_has_key(ropts, ignore_sym)) {
         xfree(copts->ignore);
         copts->ignore = NULL;
         if (Qnil != (v = rb_hash_lookup(ropts, ignore_sym))) {
@@ -1200,6 +1244,38 @@ static VALUE safe_load(VALUE self, VALUE doc) {
  * - *io* [_IO__|_String_] IO Object to read from
  */
 
+struct dump_arg {
+    struct _out     *out;
+    struct _options *copts;
+    int    argc;
+    VALUE *argv;
+};
+
+static VALUE dump_body(VALUE a)
+{
+    volatile struct dump_arg *arg = (void *)a;
+    VALUE           rstr;
+
+    oj_dump_obj_to_json_using_params(*arg->argv, arg->copts, arg->out, arg->argc - 1, arg->argv + 1);
+    if (0 == arg->out->buf) {
+        rb_raise(rb_eNoMemError, "Not enough memory.");
+    }
+    rstr = rb_str_new2(arg->out->buf);
+    rstr = oj_encode(rstr);
+
+    return rstr;
+}
+
+static VALUE dump_ensure(VALUE a)
+{
+    volatile struct dump_arg *arg = (void *)a;
+
+    if (arg->out->allocated) {
+        xfree(arg->out->buf);
+    }
+    return Qnil;
+}
+
 /* Document-method: dump
  * call-seq: dump(obj, options={})
  *
@@ -1209,9 +1285,9 @@ static VALUE safe_load(VALUE self, VALUE doc) {
  */
 static VALUE dump(int argc, VALUE *argv, VALUE self) {
     char            buf[4096];
+    struct dump_arg arg;
     struct _out     out;
     struct _options copts = oj_default_options;
-    VALUE           rstr;
 
     if (1 > argc) {
         rb_raise(rb_eArgError, "wrong number of arguments (0 for 1).");
@@ -1225,21 +1301,18 @@ static VALUE dump(int argc, VALUE *argv, VALUE self) {
     if (CompatMode == copts.mode && copts.escape_mode != ASCIIEsc) {
         copts.escape_mode = JSONEsc;
     }
-    out.buf       = buf;
-    out.end       = buf + sizeof(buf) - 10;
-    out.allocated = false;
-    out.omit_nil  = copts.dump_opts.omit_nil;
-    out.caller    = CALLER_DUMP;
-    oj_dump_obj_to_json_using_params(*argv, &copts, &out, argc - 1, argv + 1);
-    if (0 == out.buf) {
-        rb_raise(rb_eNoMemError, "Not enough memory.");
-    }
-    rstr = rb_str_new2(out.buf);
-    rstr = oj_encode(rstr);
-    if (out.allocated) {
-        xfree(out.buf);
-    }
-    return rstr;
+    arg.out = &out;
+    arg.copts = &copts;
+    arg.argc = argc;
+    arg.argv = argv;
+
+    arg.out->buf       = buf;
+    arg.out->end       = buf + sizeof(buf) - 10;
+    arg.out->allocated = false;
+    arg.out->omit_nil  = copts.dump_opts.omit_nil;
+    arg.out->caller    = CALLER_DUMP;
+
+    return rb_ensure(dump_body, (VALUE)&arg, dump_ensure, (VALUE)&arg);
 }
 
 /* Document-method: to_json
@@ -1636,13 +1709,20 @@ extern VALUE oj_optimize_rails(VALUE self);
 
 /*
 extern void	oj_hash_test();
-
 static VALUE
 hash_test(VALUE self) {
     oj_hash_test();
     return Qnil;
 }
 */
+/*
+extern void oj_hash_sizes();
+static VALUE
+hash_test(VALUE self) {
+    oj_hash_sizes();
+    return Qnil;
+}
+*/
 
 static VALUE protect_require(VALUE x) {
     rb_require("time");
@@ -1741,7 +1821,6 @@ void Init_oj() {
     oj_file_id               = rb_intern("file?");
     oj_fileno_id             = rb_intern("fileno");
     oj_ftype_id              = rb_intern("ftype");
-    oj_has_key_id            = rb_intern("has_key?");
     oj_hash_end_id           = rb_intern("hash_end");
     oj_hash_key_id           = rb_intern("hash_key");
     oj_hash_set_id           = rb_intern("hash_set");
@@ -1816,6 +1895,10 @@ void Init_oj() {
     rb_gc_register_address(&bigdecimal_load_sym);
     bigdecimal_sym = ID2SYM(rb_intern("bigdecimal"));
     rb_gc_register_address(&bigdecimal_sym);
+    cache_keys_sym = ID2SYM(rb_intern("cache_keys"));
+    rb_gc_register_address(&cache_keys_sym);
+    cache_str_sym = ID2SYM(rb_intern("cache_str"));
+    rb_gc_register_address(&cache_str_sym);
     circular_sym = ID2SYM(rb_intern("circular"));
     rb_gc_register_address(&circular_sym);
     class_cache_sym = ID2SYM(rb_intern("class_cache"));

data/ext/oj/oj.h

@@ -143,6 +143,8 @@ typedef struct _options {
     char safe;           // YesNo
     char sec_prec_set;   // boolean (0 or 1)
     char ignore_under;   // YesNo - ignore attrs starting with _ if true in object and custom modes
+    char cache_keys;     // YexNo
+    char cache_str;      // string short than or equal to this are cache
     int64_t          int_range_min;  // dump numbers below as string
     int64_t          int_range_max;  // dump numbers above as string
     const char *     create_id;      // 0 or string
@@ -243,6 +245,7 @@ extern VALUE oj_compat_parse_cstr(int argc, VALUE *argv, char *json, size_t len)
 extern VALUE oj_object_parse_cstr(int argc, VALUE *argv, char *json, size_t len);
 extern VALUE oj_custom_parse_cstr(int argc, VALUE *argv, char *json, size_t len);
 
+extern bool oj_hash_has_key(VALUE hash, VALUE key);
 extern void oj_parse_options(VALUE ropts, Options copts);
 
 extern void oj_dump_obj_to_json(VALUE obj, Options copts, Out out);
@@ -325,7 +328,6 @@ extern ID oj_exclude_end_id;
 extern ID oj_file_id;
 extern ID oj_fileno_id;
 extern ID oj_ftype_id;
-extern ID oj_has_key_id;
 extern ID oj_hash_end_id;
 extern ID oj_hash_key_id;
 extern ID oj_hash_set_id;

data/ext/oj/parse.h

@@ -90,6 +90,9 @@ extern void oj_set_wab_callbacks(ParseInfo pi);
 extern void  oj_sparse2(ParseInfo pi);
 extern VALUE oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd);
 
+extern VALUE oj_cstr_to_value(const char *str, size_t len, size_t cache_str);
+extern VALUE oj_calc_hash_key(ParseInfo pi, Val parent);
+
 static inline void parse_info_init(ParseInfo pi) {
     memset(pi, 0, sizeof(struct _parseInfo));
 }

data/ext/oj/scp.c

@@ -9,6 +9,7 @@
 #include <unistd.h>
 
 #include "encode.h"
+#include "hash.h"
 #include "oj.h"
 #include "parse.h"
 
@@ -82,19 +83,6 @@ static void end_array(ParseInfo pi) {
     rb_funcall(pi->handler, oj_array_end_id, 0);
 }
 
-static VALUE calc_hash_key(ParseInfo pi, Val kval) {
-    volatile VALUE rkey = kval->key_val;
-
-    if (Qundef == rkey) {
-        rkey = rb_str_new(kval->key, kval->klen);
-        rkey = oj_encode(rkey);
-        if (Yes == pi->options.sym_key) {
-            rkey = rb_str_intern(rkey);
-        }
-    }
-    return rkey;
-}
-
 static VALUE hash_key(ParseInfo pi, const char *key, size_t klen) {
     return rb_funcall(pi->handler, oj_hash_key_id, 1, rb_str_new(key, klen));
 }
@@ -107,7 +95,7 @@ static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, c
                oj_hash_set_id,
                3,
                stack_peek(&pi->stack)->val,
-               calc_hash_key(pi, kval),
+               oj_calc_hash_key(pi, kval),
                rstr);
 }
 
@@ -116,7 +104,7 @@ static void hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
                oj_hash_set_id,
                3,
                stack_peek(&pi->stack)->val,
-               calc_hash_key(pi, kval),
+               oj_calc_hash_key(pi, kval),
                oj_num_as_value(ni));
 }
 
@@ -125,7 +113,7 @@ static void hash_set_value(ParseInfo pi, Val kval, VALUE value) {
                oj_hash_set_id,
                3,
                stack_peek(&pi->stack)->val,
-               calc_hash_key(pi, kval),
+               oj_calc_hash_key(pi, kval),
                value);
 }