oj 3.11.5 → 3.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964a9272c141179cf6f61317e89bc8dab43184b0d143355dc2212b89f123ccad
-  data.tar.gz: 53a3b3cd773a87953cec71a649f491682b022c13d56ebcc4eb5653bc9cbb560e
+  metadata.gz: 125ec67a260b09db65d47add3487d46c55ee805ebaa721d3bf841ef27fe3ade7
+  data.tar.gz: a1cd38c40217e8c5ffd24f8759ff00f0d6770dcab56a736bd0c4ba52d5f3a03a
 SHA512:
-  metadata.gz: 947dad8a5cfc4d5adb3efbd40218439c984ae6084ef304f6b3012e26e047438a03b6f149b7c224982fc8fd0a699b56fa0e6b9a174e8b00d6567dd911f601f227
-  data.tar.gz: 536b05addb483b631883ccfb9269c6cd93b3e988ea9845021be3e2383a708974ff4e63a9d64a1a76bd8a9934969c42aa16495eccd75e88b7cf4704f619e7b693
+  metadata.gz: 63496098643062caf40131db78e9ef1ccd75f9fd56f32e49538ccb6e005a42dcc86198d202562edc0b149b7ee649492376584d21554423846ac078efec700899
+  data.tar.gz: 9d619857d1f9f217d5e7c27c8a999013516680de8e28bc835ee2e267e60eee5dacde1a69e2de694d99d8caf21eb7e5c0c5a51ab9407d03b509423af894913985

data/README.md

@@ -1,6 +1,10 @@
 # [![{}j](http://www.ohler.com/dev/images/oj_comet_64.svg)](http://www.ohler.com/oj) gem
 
-[![Build Status](https://img.shields.io/travis/ohler55/oj/master.svg?logo=travis)](http://travis-ci.org/ohler55/oj?branch=master) ![Gem](https://img.shields.io/gem/v/oj.svg) ![Gem](https://img.shields.io/gem/dt/oj.svg) [![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=oj&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=oj&package-manager=bundler&version-scheme=semver) [![TideLift](https://tidelift.com/badges/github/ohler55/oj)](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme)
+[![Build Status](https://img.shields.io/github/workflow/status/ohler55/oj/CI?logo=github)](https://github.com/ohler55/oj/actions/workflows/CI.yml)
+![Gem](https://img.shields.io/gem/v/oj.svg)
+![Gem](https://img.shields.io/gem/dt/oj.svg)
+[![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=oj&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=oj&package-manager=bundler&version-scheme=semver)
+[![TideLift](https://tidelift.com/badges/github/ohler55/oj)](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme)
 
 A *fast* JSON parser and Object marshaller as a Ruby gem.
 

data/ext/oj/compat.c

@@ -23,14 +23,34 @@ static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, c
         parent->classname = oj_strndup(str, len);
         parent->clen      = len;
     } else {
-        volatile VALUE rstr = rb_str_new(str, len);
+        volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
 
         if (Qundef == rkey) {
-            rkey = rb_str_new(key, klen);
-            rstr = oj_encode(rstr);
-            rkey = oj_encode(rkey);
-            if (Yes == pi->options.sym_key) {
-                rkey = rb_str_intern(rkey);
+            if (Yes != pi->options.cache_keys) {
+                rkey = rb_str_new(key, klen);
+                rkey = oj_encode(rkey);
+                if (Yes == pi->options.sym_key) {
+                    rkey = rb_str_intern(rkey);
+                }
+            } else {
+                VALUE *slot;
+
+                if (Yes == pi->options.sym_key) {
+                    if (Qnil == (rkey = oj_sym_hash_get(key, klen, &slot))) {
+                        rkey  = rb_str_new(key, 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(key, klen, &slot))) {
+                        rkey  = rb_str_new(key, klen);
+                        rkey  = oj_encode(rkey);
+                        *slot = rkey;
+                        rb_gc_register_address(slot);
+                    }
+                }
             }
         }
         if (Yes == pi->options.create_ok && NULL != pi->options.str_rx.head) {
@@ -93,23 +113,9 @@ static void end_hash(struct _parseInfo *pi) {
     }
 }
 
-static VALUE calc_hash_key(ParseInfo pi, Val parent) {
-    volatile VALUE rkey = parent->key_val;
-
-    if (Qundef == rkey) {
-        rkey = rb_str_new(parent->key, parent->klen);
-    }
-    rkey = oj_encode(rkey);
-    if (Yes == pi->options.sym_key) {
-        rkey = rb_str_intern(rkey);
-    }
-    return rkey;
-}
-
 static void add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
-    volatile VALUE rstr = rb_str_new(str, len);
+    volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
 
-    rstr = oj_encode(rstr);
     if (Yes == pi->options.create_ok && NULL != pi->options.str_rx.head) {
         VALUE clas = oj_rxclass_match(&pi->options.str_rx, str, (int)len);
 
@@ -142,10 +148,10 @@ static void hash_set_num(struct _parseInfo *pi, Val parent, NumInfo ni) {
         rb_funcall(stack_peek(&pi->stack)->val,
                    rb_intern("[]="),
                    2,
-                   calc_hash_key(pi, parent),
+                   oj_calc_hash_key(pi, parent),
                    rval);
     } else {
-        rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), rval);
+        rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), rval);
     }
     if (Yes == pi->options.trace) {
         oj_trace_parse_call("set_number", pi, __FILE__, __LINE__, rval);
@@ -161,10 +167,10 @@ static void hash_set_value(ParseInfo pi, Val parent, VALUE value) {
         rb_funcall(stack_peek(&pi->stack)->val,
                    rb_intern("[]="),
                    2,
-                   calc_hash_key(pi, parent),
+                   oj_calc_hash_key(pi, parent),
                    value);
     } else {
-        rb_hash_aset(stack_peek(&pi->stack)->val, calc_hash_key(pi, parent), value);
+        rb_hash_aset(stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, parent), value);
     }
     if (Yes == pi->options.trace) {
         oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, value);
@@ -199,9 +205,8 @@ static void array_append_num(ParseInfo pi, NumInfo ni) {
 }
 
 static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
-    volatile VALUE rstr = rb_str_new(str, len);
+    volatile VALUE rstr = oj_cstr_to_value(str, len, (size_t)pi->options.cache_str);
 
-    rstr = oj_encode(rstr);
     if (Yes == pi->options.create_ok && NULL != pi->options.str_rx.head) {
         VALUE clas = oj_rxclass_match(&pi->options.str_rx, str, (int)len);
 

data/ext/oj/custom.c

@@ -955,6 +955,7 @@ 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_str_new(str, len);
 
         if (Qundef == rkey) {
@@ -1010,19 +1011,6 @@ static void end_hash(struct _parseInfo *pi) {
     }
 }
 
-static VALUE calc_hash_key(ParseInfo pi, Val parent) {
-    volatile VALUE rkey = parent->key_val;
-
-    if (Qundef == rkey) {
-        rkey = rb_str_new(parent->key, parent->klen);
-    }
-    rkey = oj_encode(rkey);
-    if (Yes == pi->options.sym_key) {
-        rkey = rb_str_intern(rkey);
-    }
-    return rkey;
-}
-
 static void hash_set_num(struct _parseInfo *pi, Val kval, NumInfo ni) {
     Val            parent = stack_peek(&pi->stack);
     volatile VALUE rval   = oj_num_as_value(ni);
@@ -1067,7 +1055,7 @@ static void hash_set_num(struct _parseInfo *pi, Val kval, NumInfo ni) {
             }
             rval = parent->val;
         } else {
-            rb_hash_aset(parent->val, calc_hash_key(pi, kval), rval);
+            rb_hash_aset(parent->val, oj_calc_hash_key(pi, kval), rval);
         }
         break;
     default: break;
@@ -1082,7 +1070,7 @@ static void hash_set_value(ParseInfo pi, Val kval, VALUE value) {
 
     switch (rb_type(parent->val)) {
     case T_OBJECT: oj_set_obj_ivar(parent, kval, value); break;
-    case T_HASH: rb_hash_aset(parent->val, calc_hash_key(pi, kval), value); break;
+    case T_HASH: rb_hash_aset(parent->val, oj_calc_hash_key(pi, kval), value); break;
     default: break;
     }
     if (Yes == pi->options.trace) {

data/ext/oj/dump.c

@@ -535,59 +535,57 @@ void oj_dump_xml_time(VALUE obj, Out out) {
     }
     if ((0 == nsec && !out->opts->sec_prec_set) || 0 == out->opts->sec_prec) {
         if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
-            sprintf(buf,
-                    "%04d-%02d-%02dT%02d:%02d:%02dZ",
-                    ti.year,
-                    ti.mon,
-                    ti.day,
-                    ti.hour,
-                    ti.min,
-                    ti.sec);
-            oj_dump_cstr(buf, 20, 0, 0, out);
+            int len = sprintf(buf,
+                              "%04d-%02d-%02dT%02d:%02d:%02dZ",
+                              ti.year,
+                              ti.mon,
+                              ti.day,
+                              ti.hour,
+                              ti.min,
+                              ti.sec);
+            oj_dump_cstr(buf, len, 0, 0, out);
         } else {
-            sprintf(buf,
-                    "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
-                    ti.year,
-                    ti.mon,
-                    ti.day,
-                    ti.hour,
-                    ti.min,
-                    ti.sec,
-                    tzsign,
-                    tzhour,
-                    tzmin);
-            oj_dump_cstr(buf, 25, 0, 0, out);
+            int len = sprintf(buf,
+                              "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
+                              ti.year,
+                              ti.mon,
+                              ti.day,
+                              ti.hour,
+                              ti.min,
+                              ti.sec,
+                              tzsign,
+                              tzhour,
+                              tzmin);
+            oj_dump_cstr(buf, len, 0, 0, out);
         }
     } else if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
         char format[64] = "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ";
-        int  len        = 30;
+        int  len;
 
         if (9 > out->opts->sec_prec) {
             format[32] = '0' + out->opts->sec_prec;
-            len -= 9 - out->opts->sec_prec;
         }
-        sprintf(buf, format, ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, (long)nsec);
+        len = sprintf(buf, format, ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, (long)nsec);
         oj_dump_cstr(buf, len, 0, 0, out);
     } else {
         char format[64] = "%04d-%02d-%02dT%02d:%02d:%02d.%09ld%c%02d:%02d";
-        int  len        = 35;
+        int  len;
 
         if (9 > out->opts->sec_prec) {
             format[32] = '0' + out->opts->sec_prec;
-            len -= 9 - out->opts->sec_prec;
         }
-        sprintf(buf,
-                format,
-                ti.year,
-                ti.mon,
-                ti.day,
-                ti.hour,
-                ti.min,
-                ti.sec,
-                (long)nsec,
-                tzsign,
-                tzhour,
-                tzmin);
+        len = sprintf(buf,
+                      format,
+                      ti.year,
+                      ti.mon,
+                      ti.day,
+                      ti.hour,
+                      ti.min,
+                      ti.sec,
+                      (long)nsec,
+                      tzsign,
+                      tzhour,
+                      tzmin);
         oj_dump_cstr(buf, len, 0, 0, out);
     }
 }
@@ -827,9 +825,8 @@ void oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out ou
         if (is_sym) {
             *out->cur++ = ':';
         }
-        for (; '\0' != *str; str++) {
-            *out->cur++ = *str;
-        }
+        memcpy(out->cur, str, cnt);
+        out->cur += cnt;
         *out->cur++ = '"';
     } else {
         const char *end         = str + cnt;
@@ -1206,7 +1203,7 @@ void oj_dump_float(VALUE obj, int depth, Out out, bool as_ok) {
         if ((int)sizeof(buf) <= cnt) {
             cnt = sizeof(buf) - 1;
         }
-        strncpy(buf, rb_string_value_ptr((VALUE *)&rstr), cnt);
+        memcpy(buf, rb_string_value_ptr((VALUE *)&rstr), cnt);
         buf[cnt] = '\0';
     } else {
         cnt = oj_dump_float_printf(buf, sizeof(buf), obj, d, out->opts->float_fmt);

data/ext/oj/dump_strict.c

@@ -98,7 +98,7 @@ static void dump_float(VALUE obj, int depth, Out out, bool as_ok) {
             if ((int)sizeof(buf) <= cnt) {
                 cnt = sizeof(buf) - 1;
             }
-            strncpy(buf, rb_string_value_ptr((VALUE *)&rstr), cnt);
+            memcpy(buf, rb_string_value_ptr((VALUE *)&rstr), cnt);
             buf[cnt] = '\0';
         } else {
             cnt = oj_dump_float_printf(buf, sizeof(buf), obj, d, out->opts->float_fmt);

data/ext/oj/fast.c

@@ -80,22 +80,6 @@ static Leaf  get_doc_leaf(Doc doc, const char *path);
 static Leaf  get_leaf(Leaf *stack, Leaf *lp, const char *path);
 static void  each_value(Doc doc, Leaf leaf);
 
-static void  doc_init(Doc doc);
-static void  doc_free(Doc doc);
-static VALUE doc_open(VALUE clas, VALUE str);
-static VALUE doc_open_file(VALUE clas, VALUE filename);
-static VALUE doc_where(VALUE self);
-static VALUE doc_local_key(VALUE self);
-static VALUE doc_home(VALUE self);
-static VALUE doc_type(int argc, VALUE *argv, VALUE self);
-static VALUE doc_fetch(int argc, VALUE *argv, VALUE self);
-static VALUE doc_each_leaf(int argc, VALUE *argv, VALUE self);
-static VALUE doc_move(VALUE self, VALUE str);
-static VALUE doc_each_child(int argc, VALUE *argv, VALUE self);
-static VALUE doc_each_value(int argc, VALUE *argv, VALUE self);
-static VALUE doc_dump(int argc, VALUE *argv, VALUE self);
-static VALUE doc_size(VALUE self);
-
 VALUE oj_doc_class = Qundef;
 
 // This is only for CentOS 5.4 with Ruby 1.9.3-p0.
@@ -899,12 +883,14 @@ static Leaf get_leaf(Leaf *stack, Leaf *lp, const char *path) {
             } else {
                 return 0;
             }
-        } else if (COL_VAL == leaf->value_type && 0 != leaf->elements) {
+        } else if (NULL == leaf->elements) {
+            leaf = NULL;
+        } else if (COL_VAL == leaf->value_type) {
             Leaf first = leaf->elements->next;
             Leaf e     = first;
             int  type  = leaf->rtype;
 
-            leaf = 0;
+            leaf = NULL;
             if (T_ARRAY == type) {
                 int cnt = 0;
 
@@ -929,6 +915,7 @@ static Leaf get_leaf(Leaf *stack, Leaf *lp, const char *path) {
                 const char *slash = next_slash(path);
                 int         klen;
 
+                leaf = NULL;
                 if (0 == slash) {
                     klen = (int)strlen(key);
                     path += klen;
@@ -1217,7 +1204,7 @@ static char *append_key(char *p, const char *key) {
  * @see Oj::Doc.open
  */
 
-/* @overload where?() => String
+/* @overload where() => String
  *
  * Returns a String that describes the absolute path to the current location
  * in the JSON document.
@@ -1259,6 +1246,25 @@ static VALUE doc_where(VALUE self) {
     }
 }
 
+/* @overload where?() => String
+ * @deprecated
+ * Returns a String that describes the absolute path to the current location
+ * in the JSON document.
+ */
+static VALUE doc_where_q(VALUE self) {
+    return doc_where(self);
+}
+
+/* @overload path() => String
+ *
+ * Returns a String that describes the absolute path to the current location
+ * in the JSON document.
+ */
+static VALUE doc_path(VALUE self) {
+    return doc_where(self);
+}
+
+
 /* @overload local_key() => String, Fixnum, nil
  *
  * Returns the final key to the current location.
@@ -1340,14 +1346,14 @@ static VALUE doc_type(int argc, VALUE *argv, VALUE self) {
     return type;
 }
 
-/* @overload fetch(path=nil) => nil, true, false, Fixnum, Float, String, Array,
+/* @overload fetch(path=nil,default=nil) => nil, true, false, Fixnum, Float, String, Array,
  * Hash
  *
  * Returns the value at the location identified by the path or the current
  * location if the path is nil or not provided. This method will create and
  * return an Array or Hash if that is the type of Object at the location
  * specified. This is more expensive than navigating to the leaves of the JSON
- * document.
+ * document. If a default is provided that is used if no value if found.
  *   @param [String] path path to the location to get the type of if provided
  * @example
  *   Oj::Doc.open('[1,2]') { |doc| doc.fetch() }      #=> [1, 2]
@@ -1373,6 +1379,28 @@ static VALUE doc_fetch(int argc, VALUE *argv, VALUE self) {
     return val;
 }
 
+/* @overload exists?(path) => true, false
+ *
+ * Returns true if the value at the location identified by the path exists.
+ *   @param [String] path path to the location
+ * @example
+ *   Oj::Doc.open('[1,2]') { |doc| doc.exists('/1') }  #=> true
+ *   Oj::Doc.open('[1,2]') { |doc| doc.exists('/3') }  #=> false
+ */
+static VALUE doc_exists(VALUE self, VALUE str) {
+    Doc  doc;
+    Leaf leaf;
+
+    doc = self_doc(self);
+    Check_Type(str, T_STRING);
+    if (0 != (leaf = get_doc_leaf(doc, StringValuePtr(str)))) {
+        if (NULL != leaf) {
+            return Qtrue;
+        }
+    }
+    return Qfalse;
+}
+
 /* @overload each_leaf(path=nil) => nil
  *
  * Yields to the provided block for each leaf node with the identified
@@ -1695,11 +1723,14 @@ void oj_init_doc() {
     rb_define_singleton_method(oj_doc_class, "open", doc_open, 1);
     rb_define_singleton_method(oj_doc_class, "open_file", doc_open_file, 1);
     rb_define_singleton_method(oj_doc_class, "parse", doc_open, 1);
-    rb_define_method(oj_doc_class, "where?", doc_where, 0);
+    rb_define_method(oj_doc_class, "where?", doc_where_q, 0);
+    rb_define_method(oj_doc_class, "where", doc_where, 0);
+    rb_define_method(oj_doc_class, "path", doc_path, 0);
     rb_define_method(oj_doc_class, "local_key", doc_local_key, 0);
     rb_define_method(oj_doc_class, "home", doc_home, 0);
     rb_define_method(oj_doc_class, "type", doc_type, -1);
     rb_define_method(oj_doc_class, "fetch", doc_fetch, -1);
+    rb_define_method(oj_doc_class, "exists?", doc_exists, 1);
     rb_define_method(oj_doc_class, "each_leaf", doc_each_leaf, -1);
     rb_define_method(oj_doc_class, "move", doc_move, 1);
     rb_define_method(oj_doc_class, "each_child", doc_each_child, -1);

data/ext/oj/hash.c

@@ -5,8 +5,8 @@
 
 #include <stdint.h>
 
-#define HASH_MASK 0x000003FF
-#define HASH_SLOT_CNT 1024
+#define HASH_SLOT_CNT ((uint32_t)8192)
+#define HASH_MASK (HASH_SLOT_CNT - 1)
 
 typedef struct _keyVal {
     struct _keyVal *next;
@@ -20,6 +20,8 @@ struct _hash {
 };
 
 struct _hash class_hash;
+struct _hash str_hash;
+struct _hash sym_hash;
 struct _hash intern_hash;
 
 // almost the Murmur hash algorithm
@@ -64,6 +66,8 @@ static uint32_t hash_calc(const uint8_t *key, size_t len) {
 
 void oj_hash_init() {
     memset(class_hash.slots, 0, sizeof(class_hash.slots));
+    memset(str_hash.slots, 0, sizeof(str_hash.slots));
+    memset(sym_hash.slots, 0, sizeof(sym_hash.slots));
     memset(intern_hash.slots, 0, sizeof(intern_hash.slots));
 }
 
@@ -100,8 +104,8 @@ static VALUE hash_get(Hash hash, const char *key, size_t len, VALUE **slotp, VAL
 }
 
 void oj_hash_print() {
-    int    i;
-    KeyVal b;
+    uint32_t i;
+    KeyVal   b;
 
     for (i = 0; i < HASH_SLOT_CNT; i++) {
         printf("%4d:", i);
@@ -112,11 +116,44 @@ void oj_hash_print() {
     }
 }
 
+void oj_hash_sizes() {
+    uint32_t i;
+    KeyVal   b;
+    int      max = 0;
+    int      min = 1000000;
+
+    for (i = 0; i < HASH_SLOT_CNT; i++) {
+        int cnt = 0;
+
+        for (b = str_hash.slots + i; 0 != b && 0 != b->key; b = b->next) {
+            cnt++;
+        }
+        // printf(" %4d\n", cnt);
+        if (max < cnt) {
+            max = cnt;
+        }
+        if (cnt < min) {
+            min = cnt;
+        }
+    }
+    printf("min: %d  max: %d\n", min, max);
+}
+
 VALUE
 oj_class_hash_get(const char *key, size_t len, VALUE **slotp) {
     return hash_get(&class_hash, key, len, slotp, Qnil);
 }
 
+VALUE
+oj_str_hash_get(const char *key, size_t len, VALUE **slotp) {
+    return hash_get(&str_hash, key, len, slotp, Qnil);
+}
+
+VALUE
+oj_sym_hash_get(const char *key, size_t len, VALUE **slotp) {
+    return hash_get(&sym_hash, key, len, slotp, Qnil);
+}
+
 ID oj_attr_hash_get(const char *key, size_t len, ID **slotp) {
     return (ID)hash_get(&intern_hash, key, len, (VALUE **)slotp, 0);
 }