oj 3.7.4 → 3.13.21
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1352 -0
- data/README.md +29 -8
- data/RELEASE_NOTES.md +61 -0
- data/ext/oj/buf.h +53 -72
- data/ext/oj/cache.c +326 -0
- data/ext/oj/cache.h +21 -0
- data/ext/oj/cache8.c +61 -64
- data/ext/oj/cache8.h +12 -39
- data/ext/oj/circarray.c +37 -43
- data/ext/oj/circarray.h +16 -17
- data/ext/oj/code.c +165 -179
- data/ext/oj/code.h +27 -29
- data/ext/oj/compat.c +174 -194
- data/ext/oj/custom.c +809 -866
- data/ext/oj/debug.c +132 -0
- data/ext/oj/dump.c +848 -863
- data/ext/oj/dump.h +81 -67
- data/ext/oj/dump_compat.c +85 -123
- data/ext/oj/dump_leaf.c +100 -188
- data/ext/oj/dump_object.c +527 -656
- data/ext/oj/dump_strict.c +315 -338
- data/ext/oj/encode.h +7 -34
- data/ext/oj/encoder.c +43 -0
- data/ext/oj/err.c +40 -29
- data/ext/oj/err.h +48 -48
- data/ext/oj/extconf.rb +17 -4
- data/ext/oj/fast.c +1070 -1087
- data/ext/oj/intern.c +301 -0
- data/ext/oj/intern.h +26 -0
- data/ext/oj/mimic_json.c +469 -436
- data/ext/oj/object.c +525 -593
- data/ext/oj/odd.c +154 -138
- data/ext/oj/odd.h +37 -38
- data/ext/oj/oj.c +1325 -986
- data/ext/oj/oj.h +333 -316
- data/ext/oj/parse.c +1002 -846
- data/ext/oj/parse.h +92 -87
- data/ext/oj/parser.c +1557 -0
- data/ext/oj/parser.h +91 -0
- data/ext/oj/rails.c +888 -878
- data/ext/oj/rails.h +11 -14
- data/ext/oj/reader.c +141 -147
- data/ext/oj/reader.h +73 -89
- data/ext/oj/resolve.c +41 -62
- data/ext/oj/resolve.h +7 -9
- data/ext/oj/rxclass.c +71 -75
- data/ext/oj/rxclass.h +18 -19
- data/ext/oj/saj.c +443 -486
- data/ext/oj/saj2.c +602 -0
- data/ext/oj/scp.c +88 -113
- data/ext/oj/sparse.c +787 -709
- data/ext/oj/stream_writer.c +133 -159
- data/ext/oj/strict.c +127 -118
- data/ext/oj/string_writer.c +230 -249
- data/ext/oj/trace.c +34 -41
- data/ext/oj/trace.h +19 -19
- data/ext/oj/usual.c +1254 -0
- data/ext/oj/util.c +136 -0
- data/ext/oj/util.h +20 -0
- data/ext/oj/val_stack.c +59 -67
- data/ext/oj/val_stack.h +91 -129
- data/ext/oj/validate.c +46 -0
- data/ext/oj/wab.c +342 -353
- data/lib/oj/bag.rb +1 -0
- data/lib/oj/easy_hash.rb +5 -4
- data/lib/oj/error.rb +1 -1
- data/lib/oj/json.rb +1 -1
- data/lib/oj/mimic.rb +48 -14
- data/lib/oj/saj.rb +20 -6
- data/lib/oj/state.rb +8 -7
- data/lib/oj/version.rb +2 -2
- data/lib/oj.rb +0 -8
- data/pages/Compatibility.md +1 -1
- data/pages/JsonGem.md +15 -0
- data/pages/Modes.md +53 -46
- data/pages/Options.md +72 -11
- data/pages/Parser.md +309 -0
- data/pages/Rails.md +73 -22
- data/pages/Security.md +1 -1
- data/test/activerecord/result_test.rb +7 -2
- data/test/activesupport5/abstract_unit.rb +45 -0
- data/test/activesupport5/decoding_test.rb +68 -60
- data/test/activesupport5/encoding_test.rb +111 -96
- data/test/activesupport5/encoding_test_cases.rb +33 -25
- data/test/activesupport5/test_helper.rb +43 -21
- data/test/activesupport5/time_zone_test_helpers.rb +18 -3
- data/test/activesupport6/abstract_unit.rb +44 -0
- data/test/activesupport6/decoding_test.rb +133 -0
- data/test/activesupport6/encoding_test.rb +507 -0
- data/test/activesupport6/encoding_test_cases.rb +98 -0
- data/test/activesupport6/test_common.rb +17 -0
- data/test/activesupport6/test_helper.rb +163 -0
- data/test/activesupport6/time_zone_test_helpers.rb +39 -0
- data/test/activesupport7/abstract_unit.rb +49 -0
- data/test/activesupport7/decoding_test.rb +125 -0
- data/test/activesupport7/encoding_test.rb +486 -0
- data/test/activesupport7/encoding_test_cases.rb +104 -0
- data/test/activesupport7/time_zone_test_helpers.rb +47 -0
- data/test/bar.rb +6 -12
- data/test/baz.rb +16 -0
- data/test/bug.rb +16 -0
- data/test/foo.rb +69 -75
- data/test/helper.rb +16 -0
- data/test/json_gem/json_common_interface_test.rb +8 -3
- data/test/json_gem/json_generator_test.rb +18 -4
- data/test/json_gem/json_parser_test.rb +9 -0
- data/test/json_gem/test_helper.rb +12 -0
- data/test/mem.rb +33 -0
- data/test/perf.rb +1 -1
- data/test/perf_dump.rb +50 -0
- data/test/perf_once.rb +58 -0
- data/test/perf_parser.rb +189 -0
- data/test/perf_scp.rb +11 -10
- data/test/perf_strict.rb +17 -23
- data/test/prec.rb +23 -0
- data/test/sample_json.rb +1 -1
- data/test/test_compat.rb +46 -10
- data/test/test_custom.rb +147 -8
- data/test/test_fast.rb +62 -2
- data/test/test_file.rb +25 -2
- data/test/test_gc.rb +13 -0
- data/test/test_generate.rb +21 -0
- data/test/test_hash.rb +11 -1
- data/test/test_integer_range.rb +7 -2
- data/test/test_object.rb +85 -9
- data/test/test_parser.rb +27 -0
- data/test/test_parser_saj.rb +335 -0
- data/test/test_parser_usual.rb +217 -0
- data/test/test_rails.rb +35 -0
- data/test/test_saj.rb +1 -1
- data/test/test_scp.rb +5 -5
- data/test/test_strict.rb +26 -1
- data/test/test_various.rb +87 -65
- data/test/test_wab.rb +2 -0
- data/test/test_writer.rb +19 -2
- data/test/tests.rb +1 -1
- data/test/zoo.rb +13 -0
- metadata +60 -110
- data/ext/oj/hash.c +0 -163
- data/ext/oj/hash.h +0 -46
- data/ext/oj/hash_test.c +0 -512
data/ext/oj/intern.c
ADDED
@@ -0,0 +1,301 @@
|
|
1
|
+
// Copyright (c) 2011, 2021 Peter Ohler. All rights reserved.
|
2
|
+
// Licensed under the MIT License. See LICENSE file in the project root for license details.
|
3
|
+
|
4
|
+
#include "intern.h"
|
5
|
+
|
6
|
+
#include <stdint.h>
|
7
|
+
|
8
|
+
#if HAVE_PTHREAD_MUTEX_INIT
|
9
|
+
#include <pthread.h>
|
10
|
+
#endif
|
11
|
+
#include "cache.h"
|
12
|
+
#include "parse.h"
|
13
|
+
|
14
|
+
// Only used for the class cache so 256 should be sufficient.
|
15
|
+
#define HASH_SLOT_CNT ((uint64_t)256)
|
16
|
+
#define HASH_MASK (HASH_SLOT_CNT - 1)
|
17
|
+
|
18
|
+
// almost the Murmur hash algorithm
|
19
|
+
#define M 0x5bd1e995
|
20
|
+
|
21
|
+
typedef struct _keyVal {
|
22
|
+
struct _keyVal *next;
|
23
|
+
const char * key;
|
24
|
+
size_t len;
|
25
|
+
VALUE val;
|
26
|
+
} * KeyVal;
|
27
|
+
|
28
|
+
typedef struct _hash {
|
29
|
+
struct _keyVal slots[HASH_SLOT_CNT];
|
30
|
+
#if HAVE_PTHREAD_MUTEX_INIT
|
31
|
+
pthread_mutex_t mutex;
|
32
|
+
#else
|
33
|
+
VALUE mutex;
|
34
|
+
#endif
|
35
|
+
} * Hash;
|
36
|
+
|
37
|
+
struct _hash class_hash;
|
38
|
+
struct _hash attr_hash;
|
39
|
+
|
40
|
+
static struct _cache *str_cache = NULL;
|
41
|
+
static VALUE str_cache_obj;
|
42
|
+
|
43
|
+
static struct _cache *sym_cache = NULL;
|
44
|
+
static VALUE sym_cache_obj;
|
45
|
+
|
46
|
+
static struct _cache *attr_cache = NULL;
|
47
|
+
static VALUE attr_cache_obj;
|
48
|
+
|
49
|
+
static VALUE form_str(const char *str, size_t len) {
|
50
|
+
return rb_str_freeze(rb_utf8_str_new(str, len));
|
51
|
+
}
|
52
|
+
|
53
|
+
static VALUE form_sym(const char *str, size_t len) {
|
54
|
+
return rb_to_symbol(rb_str_intern(rb_utf8_str_new(str, len)));
|
55
|
+
}
|
56
|
+
|
57
|
+
static VALUE form_attr(const char *str, size_t len) {
|
58
|
+
char buf[256];
|
59
|
+
|
60
|
+
if (sizeof(buf) - 2 <= len) {
|
61
|
+
char *b = ALLOC_N(char, len + 2);
|
62
|
+
ID id;
|
63
|
+
|
64
|
+
if ('~' == *str) {
|
65
|
+
memcpy(b, str + 1, len - 1);
|
66
|
+
b[len - 1] = '\0';
|
67
|
+
len -= 2;
|
68
|
+
} else {
|
69
|
+
*b = '@';
|
70
|
+
memcpy(b + 1, str, len);
|
71
|
+
b[len + 1] = '\0';
|
72
|
+
}
|
73
|
+
id = rb_intern3(buf, len + 1, oj_utf8_encoding);
|
74
|
+
xfree(b);
|
75
|
+
return id;
|
76
|
+
}
|
77
|
+
if ('~' == *str) {
|
78
|
+
memcpy(buf, str + 1, len - 1);
|
79
|
+
buf[len - 1] = '\0';
|
80
|
+
len -= 2;
|
81
|
+
} else {
|
82
|
+
*buf = '@';
|
83
|
+
memcpy(buf + 1, str, len);
|
84
|
+
buf[len + 1] = '\0';
|
85
|
+
}
|
86
|
+
return (VALUE)rb_intern3(buf, len + 1, oj_utf8_encoding);
|
87
|
+
}
|
88
|
+
|
89
|
+
void oj_hash_init(void) {
|
90
|
+
VALUE cache_class = rb_define_class_under(Oj, "Cache", rb_cObject);
|
91
|
+
rb_undef_alloc_func(cache_class);
|
92
|
+
|
93
|
+
rb_gc_register_address(&cache_class);
|
94
|
+
rb_undef_alloc_func(cache_class);
|
95
|
+
|
96
|
+
str_cache = cache_create(0, form_str, true, true);
|
97
|
+
str_cache_obj = Data_Wrap_Struct(cache_class, cache_mark, cache_free, str_cache);
|
98
|
+
rb_gc_register_address(&str_cache_obj);
|
99
|
+
|
100
|
+
sym_cache = cache_create(0, form_sym, true, true);
|
101
|
+
sym_cache_obj = Data_Wrap_Struct(cache_class, cache_mark, cache_free, sym_cache);
|
102
|
+
rb_gc_register_address(&sym_cache_obj);
|
103
|
+
|
104
|
+
attr_cache = cache_create(0, form_attr, false, true);
|
105
|
+
attr_cache_obj = Data_Wrap_Struct(cache_class, cache_mark, cache_free, attr_cache);
|
106
|
+
rb_gc_register_address(&attr_cache_obj);
|
107
|
+
|
108
|
+
memset(class_hash.slots, 0, sizeof(class_hash.slots));
|
109
|
+
#if HAVE_PTHREAD_MUTEX_INIT
|
110
|
+
pthread_mutex_init(&class_hash.mutex, NULL);
|
111
|
+
#else
|
112
|
+
class_hash.mutex = rb_mutex_new();
|
113
|
+
rb_gc_register_address(&class_hash.mutex);
|
114
|
+
#endif
|
115
|
+
}
|
116
|
+
|
117
|
+
VALUE
|
118
|
+
oj_str_intern(const char *key, size_t len) {
|
119
|
+
// For huge cache sizes over half a million the rb_enc_interned_str
|
120
|
+
// performs slightly better but at more "normal" size of a several
|
121
|
+
// thousands the cache intern performs about 20% better.
|
122
|
+
#if HAVE_RB_ENC_INTERNED_STR && 0
|
123
|
+
return rb_enc_interned_str(key, len, rb_utf8_encoding());
|
124
|
+
#else
|
125
|
+
return cache_intern(str_cache, key, len);
|
126
|
+
#endif
|
127
|
+
}
|
128
|
+
|
129
|
+
VALUE
|
130
|
+
oj_sym_intern(const char *key, size_t len) {
|
131
|
+
return cache_intern(sym_cache, key, len);
|
132
|
+
}
|
133
|
+
|
134
|
+
ID
|
135
|
+
oj_attr_intern(const char *key, size_t len) {
|
136
|
+
return cache_intern(attr_cache, key, len);
|
137
|
+
}
|
138
|
+
|
139
|
+
static uint64_t hash_calc(const uint8_t *key, size_t len) {
|
140
|
+
const uint8_t *end = key + len;
|
141
|
+
const uint8_t *endless = key + (len & 0xFFFFFFFC);
|
142
|
+
uint64_t h = (uint64_t)len;
|
143
|
+
uint64_t k;
|
144
|
+
|
145
|
+
while (key < endless) {
|
146
|
+
k = (uint64_t)*key++;
|
147
|
+
k |= (uint64_t)*key++ << 8;
|
148
|
+
k |= (uint64_t)*key++ << 16;
|
149
|
+
k |= (uint64_t)*key++ << 24;
|
150
|
+
|
151
|
+
k *= M;
|
152
|
+
k ^= k >> 24;
|
153
|
+
h *= M;
|
154
|
+
h ^= k * M;
|
155
|
+
}
|
156
|
+
if (1 < end - key) {
|
157
|
+
uint16_t k16 = (uint16_t)*key++;
|
158
|
+
|
159
|
+
k16 |= (uint16_t)*key++ << 8;
|
160
|
+
h ^= k16 << 8;
|
161
|
+
}
|
162
|
+
if (key < end) {
|
163
|
+
h ^= *key;
|
164
|
+
}
|
165
|
+
h *= M;
|
166
|
+
h ^= h >> 13;
|
167
|
+
h *= M;
|
168
|
+
h ^= h >> 15;
|
169
|
+
|
170
|
+
return h;
|
171
|
+
}
|
172
|
+
|
173
|
+
static VALUE resolve_classname(VALUE mod, const char *classname, int auto_define) {
|
174
|
+
VALUE clas;
|
175
|
+
ID ci = rb_intern(classname);
|
176
|
+
|
177
|
+
if (rb_const_defined_at(mod, ci)) {
|
178
|
+
clas = rb_const_get_at(mod, ci);
|
179
|
+
} else if (auto_define) {
|
180
|
+
clas = rb_define_class_under(mod, classname, oj_bag_class);
|
181
|
+
} else {
|
182
|
+
clas = Qundef;
|
183
|
+
}
|
184
|
+
return clas;
|
185
|
+
}
|
186
|
+
|
187
|
+
static VALUE resolve_classpath(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE error_class) {
|
188
|
+
char class_name[1024];
|
189
|
+
VALUE clas;
|
190
|
+
char * end = class_name + sizeof(class_name) - 1;
|
191
|
+
char * s;
|
192
|
+
const char *n = name;
|
193
|
+
size_t nlen = len;
|
194
|
+
|
195
|
+
clas = rb_cObject;
|
196
|
+
for (s = class_name; 0 < len; n++, len--) {
|
197
|
+
if (':' == *n) {
|
198
|
+
*s = '\0';
|
199
|
+
n++;
|
200
|
+
len--;
|
201
|
+
if (':' != *n) {
|
202
|
+
return Qundef;
|
203
|
+
}
|
204
|
+
if (Qundef == (clas = resolve_classname(clas, class_name, auto_define))) {
|
205
|
+
return Qundef;
|
206
|
+
}
|
207
|
+
s = class_name;
|
208
|
+
} else if (end <= s) {
|
209
|
+
return Qundef;
|
210
|
+
} else {
|
211
|
+
*s++ = *n;
|
212
|
+
}
|
213
|
+
}
|
214
|
+
*s = '\0';
|
215
|
+
if (Qundef == (clas = resolve_classname(clas, class_name, auto_define))) {
|
216
|
+
if (sizeof(class_name) <= nlen) {
|
217
|
+
nlen = sizeof(class_name) - 1;
|
218
|
+
}
|
219
|
+
strncpy(class_name, name, nlen);
|
220
|
+
class_name[nlen] = '\0';
|
221
|
+
oj_set_error_at(pi, error_class, __FILE__, __LINE__, "class '%s' is not defined", class_name);
|
222
|
+
if (Qnil != error_class) {
|
223
|
+
pi->err_class = error_class;
|
224
|
+
}
|
225
|
+
}
|
226
|
+
return clas;
|
227
|
+
}
|
228
|
+
|
229
|
+
VALUE oj_class_intern(const char *key, size_t len, bool safe, ParseInfo pi, int auto_define, VALUE error_class) {
|
230
|
+
uint64_t h = hash_calc((const uint8_t *)key, len) & HASH_MASK;
|
231
|
+
KeyVal bucket = class_hash.slots + h;
|
232
|
+
KeyVal b;
|
233
|
+
|
234
|
+
if (safe) {
|
235
|
+
#if HAVE_PTHREAD_MUTEX_INIT
|
236
|
+
pthread_mutex_lock(&class_hash.mutex);
|
237
|
+
#else
|
238
|
+
rb_mutex_lock(class_hash.mutex);
|
239
|
+
#endif
|
240
|
+
if (NULL != bucket->key) { // not the top slot
|
241
|
+
for (b = bucket; 0 != b; b = b->next) {
|
242
|
+
if (len == b->len && 0 == strncmp(b->key, key, len)) {
|
243
|
+
#if HAVE_PTHREAD_MUTEX_INIT
|
244
|
+
pthread_mutex_unlock(&class_hash.mutex);
|
245
|
+
#else
|
246
|
+
rb_mutex_unlock(class_hash.mutex);
|
247
|
+
#endif
|
248
|
+
return b->val;
|
249
|
+
}
|
250
|
+
bucket = b;
|
251
|
+
}
|
252
|
+
b = ALLOC(struct _keyVal);
|
253
|
+
b->next = NULL;
|
254
|
+
bucket->next = b;
|
255
|
+
bucket = b;
|
256
|
+
}
|
257
|
+
bucket->key = oj_strndup(key, len);
|
258
|
+
bucket->len = len;
|
259
|
+
bucket->val = resolve_classpath(pi, key, len, auto_define, error_class);
|
260
|
+
#if HAVE_PTHREAD_MUTEX_INIT
|
261
|
+
pthread_mutex_unlock(&class_hash.mutex);
|
262
|
+
#else
|
263
|
+
rb_mutex_unlock(class_hash.mutex);
|
264
|
+
#endif
|
265
|
+
} else {
|
266
|
+
if (NULL != bucket->key) {
|
267
|
+
for (b = bucket; 0 != b; b = b->next) {
|
268
|
+
if (len == b->len && 0 == strncmp(b->key, key, len)) {
|
269
|
+
return (ID)b->val;
|
270
|
+
}
|
271
|
+
bucket = b;
|
272
|
+
}
|
273
|
+
b = ALLOC(struct _keyVal);
|
274
|
+
b->next = NULL;
|
275
|
+
bucket->next = b;
|
276
|
+
bucket = b;
|
277
|
+
}
|
278
|
+
bucket->key = oj_strndup(key, len);
|
279
|
+
bucket->len = len;
|
280
|
+
bucket->val = resolve_classpath(pi, key, len, auto_define, error_class);
|
281
|
+
}
|
282
|
+
rb_gc_register_mark_object(bucket->val);
|
283
|
+
return bucket->val;
|
284
|
+
}
|
285
|
+
|
286
|
+
char *oj_strndup(const char *s, size_t len) {
|
287
|
+
char *d = ALLOC_N(char, len + 1);
|
288
|
+
|
289
|
+
memcpy(d, s, len);
|
290
|
+
d[len] = '\0';
|
291
|
+
|
292
|
+
return d;
|
293
|
+
}
|
294
|
+
|
295
|
+
/*
|
296
|
+
void intern_cleanup(void) {
|
297
|
+
cache_free(str_cache);
|
298
|
+
cache_free(sym_cache);
|
299
|
+
cache_free(attr_cache);
|
300
|
+
}
|
301
|
+
*/
|
data/ext/oj/intern.h
ADDED
@@ -0,0 +1,26 @@
|
|
1
|
+
// Copyright (c) 2011, 2021 Peter Ohler. All rights reserved.
|
2
|
+
// Licensed under the MIT License. See LICENSE file in the project root for license details.
|
3
|
+
|
4
|
+
#ifndef OJ_INTERN_H
|
5
|
+
#define OJ_INTERN_H
|
6
|
+
|
7
|
+
#include <stdbool.h>
|
8
|
+
#include <ruby.h>
|
9
|
+
|
10
|
+
struct _parseInfo;
|
11
|
+
|
12
|
+
extern void oj_hash_init(void);
|
13
|
+
|
14
|
+
extern VALUE oj_str_intern(const char *key, size_t len);
|
15
|
+
extern VALUE oj_sym_intern(const char *key, size_t len);
|
16
|
+
extern ID oj_attr_intern(const char *key, size_t len);
|
17
|
+
extern VALUE oj_class_intern(const char * key,
|
18
|
+
size_t len,
|
19
|
+
bool safe,
|
20
|
+
struct _parseInfo *pi,
|
21
|
+
int auto_define,
|
22
|
+
VALUE error_class);
|
23
|
+
|
24
|
+
extern char *oj_strndup(const char *s, size_t len);
|
25
|
+
|
26
|
+
#endif /* OJ_INTERN_H */
|