Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve performance of Oj.load with symbol_keys mode #681

Merged
merged 1 commit into from Aug 6, 2021
Merged

Improve performance of Oj.load with symbol_keys mode #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions ext/oj/compat.c
View file
Open in desktop
Expand Up @@ -27,19 +27,18 @@ static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, c

if (Qundef == 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);
rkey = ID2SYM(rb_intern3(key, klen, oj_utf8_encoding));
} else {
rkey = rb_str_new(key, klen);
rkey = oj_encode(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);
rkey = ID2SYM(rb_intern3(key, klen, oj_utf8_encoding));
*slot = rkey;
rb_gc_register_address(slot);
}
Expand Down
9 changes: 5 additions & 4 deletions ext/oj/custom.c
View file
Open in desktop
Expand Up @@ -959,12 +959,13 @@ static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, c
volatile VALUE rstr = rb_str_new(str, len);

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);
rkey = ID2SYM(rb_intern3(key, klen, oj_utf8_encoding));
} else {
rkey = rb_str_new(key, klen);
rkey = oj_encode(rkey);
}
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);
Expand Down
19 changes: 7 additions & 12 deletions ext/oj/object.c
View file
Open in desktop
Expand Up @@ -59,14 +59,13 @@ static VALUE calc_hash_key(ParseInfo pi, Val kval, char k1) {
}
#else
if (':' == k1) {
rkey = rb_str_new(kval->key + 1, kval->klen - 1);
rkey = oj_encode(rkey);
rkey = rb_str_intern(rkey);
rkey = ID2SYM(rb_intern3(kval->key + 1, kval->klen - 1, oj_utf8_encoding));
} else {
rkey = rb_str_new(kval->key, kval->klen);
rkey = oj_encode(rkey);
if (Yes == pi->options.sym_key) {
rkey = rb_str_intern(rkey);
rkey = ID2SYM(rb_intern3(kval->key, kval->klen, oj_utf8_encoding));
} else {
rkey = rb_str_new(kval->key, kval->klen);
rkey = oj_encode(rkey);
}
}
#endif
Expand All @@ -78,9 +77,7 @@ static VALUE str_to_value(ParseInfo pi, const char *str, size_t len, const char
volatile VALUE rstr = Qnil;

if (':' == *orig && 0 < len) {
rstr = rb_str_new(str + 1, len - 1);
rstr = oj_encode(rstr);
rstr = rb_funcall(rstr, oj_to_sym_id, 0);
rstr = ID2SYM(rb_intern3(str + 1, len - 1, oj_utf8_encoding));
} else if (pi->circ_array && 3 <= len && '^' == *orig && 'r' == orig[1]) {
long i = read_long(str + 2, len - 2);

Expand Down Expand Up @@ -259,9 +256,7 @@ static int hat_cstr(ParseInfo pi, Val parent, Val kval, const char *str, size_t
parent->odd_args = oj_odd_alloc_args(odd);
} break;
case 'm':
parent->val = rb_str_new(str + 1, len - 1);
parent->val = oj_encode(parent->val);
parent->val = rb_funcall(parent->val, oj_to_sym_id, 0);
parent->val = ID2SYM(rb_intern3(str + 1, len - 1, oj_utf8_encoding));
break;
case 's':
parent->val = rb_str_new(str, len);
Expand Down
11 changes: 5 additions & 6 deletions ext/oj/strict.c
View file
Open in desktop
Expand Up @@ -39,10 +39,11 @@ VALUE oj_calc_hash_key(ParseInfo pi, Val parent) {
return rkey;
}
if (Yes != pi->options.cache_keys) {
rkey = rb_str_new(parent->key, parent->klen);
rkey = oj_encode(rkey);
if (Yes == pi->options.sym_key) {
rkey = rb_str_intern(rkey);
rkey = ID2SYM(rb_intern3(parent->key, parent->klen, oj_utf8_encoding));
} else {
rkey = rb_str_new(parent->key, parent->klen);
rkey = oj_encode(rkey);
}
OBJ_FREEZE(rkey);
return rkey;
Expand All @@ -51,9 +52,7 @@ VALUE oj_calc_hash_key(ParseInfo pi, Val parent) {

if (Yes == pi->options.sym_key) {
if (Qnil == (rkey = oj_sym_hash_get(parent->key, parent->klen, &slot))) {
rkey = rb_str_new(parent->key, parent->klen);
rkey = oj_encode(rkey);
rkey = rb_str_intern(rkey);
rkey = ID2SYM(rb_intern3(parent->key, parent->klen, oj_utf8_encoding));
*slot = rkey;
rb_gc_register_address(slot);
}
Expand Down