google-protobuf 3.21.6 → 3.23.2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of google-protobuf might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/ext/google/protobuf_c/convert.c +0 -0
- data/ext/google/protobuf_c/convert.h +0 -0
- data/ext/google/protobuf_c/defs.c +25 -15
- data/ext/google/protobuf_c/defs.h +0 -0
- data/ext/google/protobuf_c/extconf.rb +2 -3
- data/ext/google/protobuf_c/map.c +27 -42
- data/ext/google/protobuf_c/map.h +0 -0
- data/ext/google/protobuf_c/message.c +137 -105
- data/ext/google/protobuf_c/message.h +0 -0
- data/ext/google/protobuf_c/protobuf.c +4 -2
- data/ext/google/protobuf_c/protobuf.h +0 -0
- data/ext/google/protobuf_c/repeated_field.c +0 -0
- data/ext/google/protobuf_c/repeated_field.h +0 -0
- data/ext/google/protobuf_c/ruby-upb.c +11669 -8810
- data/ext/google/protobuf_c/ruby-upb.h +9057 -2889
- data/ext/google/protobuf_c/third_party/utf8_range/LICENSE +1 -0
- data/ext/google/protobuf_c/third_party/utf8_range/naive.c +0 -0
- data/ext/google/protobuf_c/third_party/utf8_range/range2-neon.c +1 -1
- data/ext/google/protobuf_c/third_party/utf8_range/range2-sse.c +0 -0
- data/ext/google/protobuf_c/third_party/utf8_range/utf8_range.h +13 -1
- data/ext/google/protobuf_c/wrap_memcpy.c +0 -0
- data/lib/google/protobuf/any_pb.rb +24 -5
- data/lib/google/protobuf/api_pb.rb +26 -23
- data/lib/google/protobuf/descriptor_dsl.rb +0 -0
- data/lib/google/protobuf/descriptor_pb.rb +32 -226
- data/lib/google/protobuf/duration_pb.rb +24 -5
- data/lib/google/protobuf/empty_pb.rb +24 -3
- data/lib/google/protobuf/field_mask_pb.rb +24 -4
- data/lib/google/protobuf/message_exts.rb +5 -0
- data/lib/google/protobuf/plugin_pb.rb +47 -0
- data/lib/google/protobuf/repeated_field.rb +0 -0
- data/lib/google/protobuf/source_context_pb.rb +24 -4
- data/lib/google/protobuf/struct_pb.rb +24 -20
- data/lib/google/protobuf/timestamp_pb.rb +24 -5
- data/lib/google/protobuf/type_pb.rb +26 -68
- data/lib/google/protobuf/wrappers_pb.rb +24 -28
- data/lib/google/protobuf.rb +0 -0
- metadata +6 -11
- data/tests/basic.rb +0 -739
- data/tests/generated_code_test.rb +0 -23
- data/tests/stress.rb +0 -38
@@ -37,6 +37,7 @@
|
|
37
37
|
#include "repeated_field.h"
|
38
38
|
|
39
39
|
static VALUE cParseError = Qnil;
|
40
|
+
static VALUE cAbstractMessage = Qnil;
|
40
41
|
static ID descriptor_instancevar_interned;
|
41
42
|
|
42
43
|
static VALUE initialize_rb_class_with_no_args(VALUE klass) {
|
@@ -52,6 +53,8 @@ VALUE MessageOrEnum_GetDescriptor(VALUE klass) {
|
|
52
53
|
// -----------------------------------------------------------------------------
|
53
54
|
|
54
55
|
typedef struct {
|
56
|
+
// IMPORTANT: WB_PROTECTED objects must only use the RB_OBJ_WRITE()
|
57
|
+
// macro to update VALUE references, as to trigger write barriers.
|
55
58
|
VALUE arena;
|
56
59
|
const upb_Message* msg; // Can get as mutable when non-frozen.
|
57
60
|
const upb_MessageDef*
|
@@ -64,9 +67,9 @@ static void Message_mark(void* _self) {
|
|
64
67
|
}
|
65
68
|
|
66
69
|
static rb_data_type_t Message_type = {
|
67
|
-
"Message",
|
70
|
+
"Google::Protobuf::Message",
|
68
71
|
{Message_mark, RUBY_DEFAULT_FREE, NULL},
|
69
|
-
.flags = RUBY_TYPED_FREE_IMMEDIATELY,
|
72
|
+
.flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
|
70
73
|
};
|
71
74
|
|
72
75
|
static Message* ruby_to_Message(VALUE msg_rb) {
|
@@ -104,7 +107,7 @@ upb_Message* Message_GetMutable(VALUE msg_rb, const upb_MessageDef** m) {
|
|
104
107
|
void Message_InitPtr(VALUE self_, upb_Message* msg, VALUE arena) {
|
105
108
|
Message* self = ruby_to_Message(self_);
|
106
109
|
self->msg = msg;
|
107
|
-
self->arena
|
110
|
+
RB_OBJ_WRITE(self_, &self->arena, arena);
|
108
111
|
ObjectCache_Add(msg, self_);
|
109
112
|
}
|
110
113
|
|
@@ -145,7 +148,8 @@ void Message_PrintMessage(StringBuilder* b, const upb_Message* msg,
|
|
145
148
|
for (int i = 0; i < n; i++) {
|
146
149
|
const upb_FieldDef* field = upb_MessageDef_Field(m, i);
|
147
150
|
|
148
|
-
if (upb_FieldDef_HasPresence(field) &&
|
151
|
+
if (upb_FieldDef_HasPresence(field) &&
|
152
|
+
!upb_Message_HasFieldByDef(msg, field)) {
|
149
153
|
continue;
|
150
154
|
}
|
151
155
|
|
@@ -155,7 +159,7 @@ void Message_PrintMessage(StringBuilder* b, const upb_Message* msg,
|
|
155
159
|
first = false;
|
156
160
|
}
|
157
161
|
|
158
|
-
upb_MessageValue msgval =
|
162
|
+
upb_MessageValue msgval = upb_Message_GetFieldByDef(msg, field);
|
159
163
|
|
160
164
|
StringBuilder_Printf(b, "%s: ", upb_FieldDef_Name(field));
|
161
165
|
|
@@ -241,15 +245,6 @@ static int extract_method_call(VALUE method_name, Message* self,
|
|
241
245
|
if (Match(m, name, f, o, "clear_", "")) return METHOD_CLEAR;
|
242
246
|
if (Match(m, name, f, o, "has_", "?") &&
|
243
247
|
(*o || (*f && upb_FieldDef_HasPresence(*f)))) {
|
244
|
-
// Disallow oneof hazzers for proto3.
|
245
|
-
// TODO(haberman): remove this test when we are enabling oneof hazzers for
|
246
|
-
// proto3.
|
247
|
-
if (*f && !upb_FieldDef_IsSubMessage(*f) &&
|
248
|
-
upb_FieldDef_RealContainingOneof(*f) &&
|
249
|
-
upb_MessageDef_Syntax(upb_FieldDef_ContainingType(*f)) !=
|
250
|
-
kUpb_Syntax_Proto2) {
|
251
|
-
return METHOD_UNKNOWN;
|
252
|
-
}
|
253
248
|
return METHOD_PRESENCE;
|
254
249
|
}
|
255
250
|
if (Match(m, name, f, o, "", "_as_value") && *f &&
|
@@ -278,7 +273,8 @@ static VALUE Message_oneof_accessor(VALUE _self, const upb_OneofDef* o,
|
|
278
273
|
return oneof_field == NULL ? Qfalse : Qtrue;
|
279
274
|
case METHOD_CLEAR:
|
280
275
|
if (oneof_field != NULL) {
|
281
|
-
|
276
|
+
upb_Message_ClearFieldByDef(Message_GetMutable(_self, NULL),
|
277
|
+
oneof_field);
|
282
278
|
}
|
283
279
|
return Qnil;
|
284
280
|
case METHOD_GETTER:
|
@@ -301,13 +297,13 @@ static void Message_setfield(upb_Message* msg, const upb_FieldDef* f, VALUE val,
|
|
301
297
|
} else {
|
302
298
|
if (val == Qnil &&
|
303
299
|
(upb_FieldDef_IsSubMessage(f) || upb_FieldDef_RealContainingOneof(f))) {
|
304
|
-
|
300
|
+
upb_Message_ClearFieldByDef(msg, f);
|
305
301
|
return;
|
306
302
|
}
|
307
303
|
msgval =
|
308
304
|
Convert_RubyToUpb(val, upb_FieldDef_Name(f), TypeInfo_get(f), arena);
|
309
305
|
}
|
310
|
-
|
306
|
+
upb_Message_SetFieldByDef(msg, f, msgval, arena);
|
311
307
|
}
|
312
308
|
|
313
309
|
VALUE Message_getfield(VALUE _self, const upb_FieldDef* f) {
|
@@ -329,12 +325,12 @@ VALUE Message_getfield(VALUE _self, const upb_FieldDef* f) {
|
|
329
325
|
upb_Array* arr = upb_Message_Mutable(msg, f, arena).array;
|
330
326
|
return RepeatedField_GetRubyWrapper(arr, TypeInfo_get(f), self->arena);
|
331
327
|
} else if (upb_FieldDef_IsSubMessage(f)) {
|
332
|
-
if (!
|
328
|
+
if (!upb_Message_HasFieldByDef(self->msg, f)) return Qnil;
|
333
329
|
upb_Message* submsg = upb_Message_Mutable(msg, f, arena).msg;
|
334
330
|
const upb_MessageDef* m = upb_FieldDef_MessageSubDef(f);
|
335
331
|
return Message_GetRubyWrapper(submsg, m, self->arena);
|
336
332
|
} else {
|
337
|
-
upb_MessageValue msgval =
|
333
|
+
upb_MessageValue msgval = upb_Message_GetFieldByDef(self->msg, f);
|
338
334
|
return Convert_UpbToRuby(msgval, TypeInfo_get(f), self->arena);
|
339
335
|
}
|
340
336
|
}
|
@@ -348,23 +344,24 @@ static VALUE Message_field_accessor(VALUE _self, const upb_FieldDef* f,
|
|
348
344
|
Message_setfield(Message_GetMutable(_self, NULL), f, argv[1], arena);
|
349
345
|
return Qnil;
|
350
346
|
case METHOD_CLEAR:
|
351
|
-
|
347
|
+
upb_Message_ClearFieldByDef(Message_GetMutable(_self, NULL), f);
|
352
348
|
return Qnil;
|
353
349
|
case METHOD_PRESENCE:
|
354
350
|
if (!upb_FieldDef_HasPresence(f)) {
|
355
351
|
rb_raise(rb_eRuntimeError, "Field does not have presence.");
|
356
352
|
}
|
357
|
-
return
|
353
|
+
return upb_Message_HasFieldByDef(Message_Get(_self, NULL), f);
|
358
354
|
case METHOD_WRAPPER_GETTER: {
|
359
355
|
Message* self = ruby_to_Message(_self);
|
360
|
-
if (
|
356
|
+
if (upb_Message_HasFieldByDef(self->msg, f)) {
|
361
357
|
PBRUBY_ASSERT(upb_FieldDef_IsSubMessage(f) &&
|
362
358
|
!upb_FieldDef_IsRepeated(f));
|
363
|
-
upb_MessageValue wrapper =
|
359
|
+
upb_MessageValue wrapper = upb_Message_GetFieldByDef(self->msg, f);
|
364
360
|
const upb_MessageDef* wrapper_m = upb_FieldDef_MessageSubDef(f);
|
365
361
|
const upb_FieldDef* value_f =
|
366
362
|
upb_MessageDef_FindFieldByNumber(wrapper_m, 1);
|
367
|
-
upb_MessageValue value =
|
363
|
+
upb_MessageValue value =
|
364
|
+
upb_Message_GetFieldByDef(wrapper.msg_val, value_f);
|
368
365
|
return Convert_UpbToRuby(value, TypeInfo_get(value_f), self->arena);
|
369
366
|
} else {
|
370
367
|
return Qnil;
|
@@ -373,19 +370,20 @@ static VALUE Message_field_accessor(VALUE _self, const upb_FieldDef* f,
|
|
373
370
|
case METHOD_WRAPPER_SETTER: {
|
374
371
|
upb_Message* msg = Message_GetMutable(_self, NULL);
|
375
372
|
if (argv[1] == Qnil) {
|
376
|
-
|
373
|
+
upb_Message_ClearFieldByDef(msg, f);
|
377
374
|
} else {
|
378
375
|
const upb_FieldDef* val_f =
|
379
376
|
upb_MessageDef_FindFieldByNumber(upb_FieldDef_MessageSubDef(f), 1);
|
380
377
|
upb_MessageValue msgval = Convert_RubyToUpb(
|
381
378
|
argv[1], upb_FieldDef_Name(f), TypeInfo_get(val_f), arena);
|
382
379
|
upb_Message* wrapper = upb_Message_Mutable(msg, f, arena).msg;
|
383
|
-
|
380
|
+
upb_Message_SetFieldByDef(wrapper, val_f, msgval, arena);
|
384
381
|
}
|
385
382
|
return Qnil;
|
386
383
|
}
|
387
384
|
case METHOD_ENUM_GETTER: {
|
388
|
-
upb_MessageValue msgval =
|
385
|
+
upb_MessageValue msgval =
|
386
|
+
upb_Message_GetFieldByDef(Message_Get(_self, NULL), f);
|
389
387
|
|
390
388
|
if (upb_FieldDef_Label(f) == kUpb_Label_Repeated) {
|
391
389
|
// Map repeated fields to a new type with ints
|
@@ -510,8 +508,8 @@ static int Map_initialize_kwarg(VALUE key, VALUE val, VALUE _self) {
|
|
510
508
|
k = Convert_RubyToUpb(key, "", map_init->key_type, NULL);
|
511
509
|
|
512
510
|
if (map_init->val_type.type == kUpb_CType_Message && TYPE(val) == T_HASH) {
|
513
|
-
|
514
|
-
|
511
|
+
upb_MiniTable* t = upb_MessageDef_MiniTable(map_init->val_type.def.msgdef);
|
512
|
+
upb_Message* msg = upb_Message_New(t, map_init->arena);
|
515
513
|
Message_InitFromValue(msg, map_init->val_type.def.msgdef, val,
|
516
514
|
map_init->arena);
|
517
515
|
v.msg_val = msg;
|
@@ -541,7 +539,8 @@ static upb_MessageValue MessageValue_FromValue(VALUE val, TypeInfo info,
|
|
541
539
|
upb_Arena* arena) {
|
542
540
|
if (info.type == kUpb_CType_Message) {
|
543
541
|
upb_MessageValue msgval;
|
544
|
-
|
542
|
+
upb_MiniTable* t = upb_MessageDef_MiniTable(info.def.msgdef);
|
543
|
+
upb_Message* msg = upb_Message_New(t, arena);
|
545
544
|
Message_InitFromValue(msg, info.def.msgdef, val, arena);
|
546
545
|
msgval.msg_val = msg;
|
547
546
|
return msgval;
|
@@ -593,7 +592,7 @@ static void Message_InitFieldFromValue(upb_Message* msg, const upb_FieldDef* f,
|
|
593
592
|
} else {
|
594
593
|
upb_MessageValue msgval =
|
595
594
|
Convert_RubyToUpb(val, upb_FieldDef_Name(f), TypeInfo_get(f), arena);
|
596
|
-
|
595
|
+
upb_Message_SetFieldByDef(msg, f, msgval, arena);
|
597
596
|
}
|
598
597
|
}
|
599
598
|
|
@@ -656,7 +655,8 @@ static VALUE Message_initialize(int argc, VALUE* argv, VALUE _self) {
|
|
656
655
|
Message* self = ruby_to_Message(_self);
|
657
656
|
VALUE arena_rb = Arena_new();
|
658
657
|
upb_Arena* arena = Arena_get(arena_rb);
|
659
|
-
|
658
|
+
upb_MiniTable* t = upb_MessageDef_MiniTable(self->msgdef);
|
659
|
+
upb_Message* msg = upb_Message_New(t, arena);
|
660
660
|
|
661
661
|
Message_InitPtr(_self, msg, arena_rb);
|
662
662
|
|
@@ -695,15 +695,20 @@ bool Message_Equal(const upb_Message* m1, const upb_Message* m2,
|
|
695
695
|
if (m1 == m2) return true;
|
696
696
|
|
697
697
|
size_t size1, size2;
|
698
|
-
int encode_opts =
|
698
|
+
int encode_opts =
|
699
|
+
kUpb_EncodeOption_SkipUnknown | kUpb_EncodeOption_Deterministic;
|
699
700
|
upb_Arena* arena_tmp = upb_Arena_New();
|
700
701
|
const upb_MiniTable* layout = upb_MessageDef_MiniTable(m);
|
701
702
|
|
702
703
|
// Compare deterministically serialized payloads with no unknown fields.
|
703
|
-
char* data1
|
704
|
-
char* data2
|
705
|
-
|
706
|
-
|
704
|
+
char* data1;
|
705
|
+
char* data2;
|
706
|
+
upb_EncodeStatus status1 =
|
707
|
+
upb_Encode(m1, layout, encode_opts, arena_tmp, &data1, &size1);
|
708
|
+
upb_EncodeStatus status2 =
|
709
|
+
upb_Encode(m2, layout, encode_opts, arena_tmp, &data2, &size2);
|
710
|
+
|
711
|
+
if (status1 == kUpb_EncodeStatus_Ok && status2 == kUpb_EncodeStatus_Ok) {
|
707
712
|
bool ret = (size1 == size2) && (memcmp(data1, data2, size1) == 0);
|
708
713
|
upb_Arena_Free(arena_tmp);
|
709
714
|
return ret;
|
@@ -735,15 +740,16 @@ static VALUE Message_eq(VALUE _self, VALUE _other) {
|
|
735
740
|
uint64_t Message_Hash(const upb_Message* msg, const upb_MessageDef* m,
|
736
741
|
uint64_t seed) {
|
737
742
|
upb_Arena* arena = upb_Arena_New();
|
738
|
-
|
743
|
+
char* data;
|
739
744
|
size_t size;
|
740
745
|
|
741
746
|
// Hash a deterministically serialized payloads with no unknown fields.
|
742
|
-
|
743
|
-
|
744
|
-
|
747
|
+
upb_EncodeStatus status = upb_Encode(
|
748
|
+
msg, upb_MessageDef_MiniTable(m),
|
749
|
+
kUpb_EncodeOption_SkipUnknown | kUpb_EncodeOption_Deterministic, arena,
|
750
|
+
&data, &size);
|
745
751
|
|
746
|
-
if (
|
752
|
+
if (status == kUpb_EncodeStatus_Ok) {
|
747
753
|
uint64_t ret = _upb_Hash(data, size, seed);
|
748
754
|
upb_Arena_Free(arena);
|
749
755
|
return ret;
|
@@ -823,7 +829,8 @@ static VALUE Message_CreateHash(const upb_Message* msg,
|
|
823
829
|
VALUE msg_key;
|
824
830
|
|
825
831
|
if (!is_proto2 && upb_FieldDef_IsSubMessage(field) &&
|
826
|
-
!upb_FieldDef_IsRepeated(field) &&
|
832
|
+
!upb_FieldDef_IsRepeated(field) &&
|
833
|
+
!upb_Message_HasFieldByDef(msg, field)) {
|
827
834
|
// TODO: Legacy behavior, remove when we fix the is_proto2 differences.
|
828
835
|
msg_key = ID2SYM(rb_intern(upb_FieldDef_Name(field)));
|
829
836
|
rb_hash_aset(hash, msg_key, Qnil);
|
@@ -832,12 +839,12 @@ static VALUE Message_CreateHash(const upb_Message* msg,
|
|
832
839
|
|
833
840
|
// Do not include fields that are not present (oneof or optional fields).
|
834
841
|
if (is_proto2 && upb_FieldDef_HasPresence(field) &&
|
835
|
-
!
|
842
|
+
!upb_Message_HasFieldByDef(msg, field)) {
|
836
843
|
continue;
|
837
844
|
}
|
838
845
|
|
839
846
|
msg_key = ID2SYM(rb_intern(upb_FieldDef_Name(field)));
|
840
|
-
msgval =
|
847
|
+
msgval = upb_Message_GetFieldByDef(msg, field);
|
841
848
|
|
842
849
|
// Proto2 omits empty map/repeated filds also.
|
843
850
|
|
@@ -940,7 +947,7 @@ static VALUE Message_index_set(VALUE _self, VALUE field_name, VALUE value) {
|
|
940
947
|
}
|
941
948
|
|
942
949
|
val = Convert_RubyToUpb(value, upb_FieldDef_Name(f), TypeInfo_get(f), arena);
|
943
|
-
|
950
|
+
upb_Message_SetFieldByDef(Message_GetMutable(_self, NULL), f, val, arena);
|
944
951
|
|
945
952
|
return Qnil;
|
946
953
|
}
|
@@ -969,10 +976,11 @@ static VALUE Message_decode(int argc, VALUE* argv, VALUE klass) {
|
|
969
976
|
rb_raise(rb_eArgError, "Expected hash arguments.");
|
970
977
|
}
|
971
978
|
|
972
|
-
VALUE depth =
|
979
|
+
VALUE depth =
|
980
|
+
rb_hash_lookup(hash_args, ID2SYM(rb_intern("recursion_limit")));
|
973
981
|
|
974
982
|
if (depth != Qnil && TYPE(depth) == T_FIXNUM) {
|
975
|
-
options |=
|
983
|
+
options |= upb_DecodeOptions_MaxDepth(FIX2INT(depth));
|
976
984
|
}
|
977
985
|
}
|
978
986
|
|
@@ -983,9 +991,10 @@ static VALUE Message_decode(int argc, VALUE* argv, VALUE klass) {
|
|
983
991
|
VALUE msg_rb = initialize_rb_class_with_no_args(klass);
|
984
992
|
Message* msg = ruby_to_Message(msg_rb);
|
985
993
|
|
986
|
-
upb_DecodeStatus status =
|
987
|
-
RSTRING_PTR(data), RSTRING_LEN(data), (upb_Message*)msg->msg,
|
988
|
-
|
994
|
+
upb_DecodeStatus status =
|
995
|
+
upb_Decode(RSTRING_PTR(data), RSTRING_LEN(data), (upb_Message*)msg->msg,
|
996
|
+
upb_MessageDef_MiniTable(msg->msgdef), NULL, options,
|
997
|
+
Arena_get(msg->arena));
|
989
998
|
|
990
999
|
if (status != kUpb_DecodeStatus_Ok) {
|
991
1000
|
rb_raise(cParseError, "Error occurred during parsing");
|
@@ -1069,7 +1078,7 @@ static VALUE Message_decode_json(int argc, VALUE* argv, VALUE klass) {
|
|
1069
1078
|
static VALUE Message_encode(int argc, VALUE* argv, VALUE klass) {
|
1070
1079
|
Message* msg = ruby_to_Message(argv[0]);
|
1071
1080
|
int options = 0;
|
1072
|
-
|
1081
|
+
char* data;
|
1073
1082
|
size_t size;
|
1074
1083
|
|
1075
1084
|
if (CLASS_OF(argv[0]) != klass) {
|
@@ -1085,19 +1094,21 @@ static VALUE Message_encode(int argc, VALUE* argv, VALUE klass) {
|
|
1085
1094
|
if (TYPE(hash_args) != T_HASH) {
|
1086
1095
|
rb_raise(rb_eArgError, "Expected hash arguments.");
|
1087
1096
|
}
|
1088
|
-
VALUE depth =
|
1097
|
+
VALUE depth =
|
1098
|
+
rb_hash_lookup(hash_args, ID2SYM(rb_intern("recursion_limit")));
|
1089
1099
|
|
1090
1100
|
if (depth != Qnil && TYPE(depth) == T_FIXNUM) {
|
1091
|
-
options |=
|
1101
|
+
options |= upb_DecodeOptions_MaxDepth(FIX2INT(depth));
|
1092
1102
|
}
|
1093
1103
|
}
|
1094
1104
|
|
1095
|
-
upb_Arena
|
1105
|
+
upb_Arena* arena = upb_Arena_New();
|
1096
1106
|
|
1097
|
-
|
1098
|
-
|
1107
|
+
upb_EncodeStatus status =
|
1108
|
+
upb_Encode(msg->msg, upb_MessageDef_MiniTable(msg->msgdef), options,
|
1109
|
+
arena, &data, &size);
|
1099
1110
|
|
1100
|
-
if (
|
1111
|
+
if (status == kUpb_EncodeStatus_Ok) {
|
1101
1112
|
VALUE ret = rb_str_new(data, size);
|
1102
1113
|
rb_enc_associate(ret, rb_ascii8bit_encoding());
|
1103
1114
|
upb_Arena_Free(arena);
|
@@ -1135,7 +1146,8 @@ static VALUE Message_encode_json(int argc, VALUE* argv, VALUE klass) {
|
|
1135
1146
|
if (argc == 2) {
|
1136
1147
|
VALUE hash_args = argv[1];
|
1137
1148
|
if (TYPE(hash_args) != T_HASH) {
|
1138
|
-
if (RTEST(rb_funcall(hash_args, rb_intern("respond_to?"), 1,
|
1149
|
+
if (RTEST(rb_funcall(hash_args, rb_intern("respond_to?"), 1,
|
1150
|
+
rb_str_new2("to_h")))) {
|
1139
1151
|
hash_args = rb_funcall(hash_args, rb_intern("to_h"), 0);
|
1140
1152
|
} else {
|
1141
1153
|
rb_raise(rb_eArgError, "Expected hash arguments.");
|
@@ -1152,6 +1164,12 @@ static VALUE Message_encode_json(int argc, VALUE* argv, VALUE klass) {
|
|
1152
1164
|
Qfalse))) {
|
1153
1165
|
options |= upb_JsonEncode_EmitDefaults;
|
1154
1166
|
}
|
1167
|
+
|
1168
|
+
if (RTEST(rb_hash_lookup2(hash_args,
|
1169
|
+
ID2SYM(rb_intern("format_enums_as_integers")),
|
1170
|
+
Qfalse))) {
|
1171
|
+
options |= upb_JsonEncode_FormatEnumsAsIntegers;
|
1172
|
+
}
|
1155
1173
|
}
|
1156
1174
|
|
1157
1175
|
upb_Status_Clear(&status);
|
@@ -1201,36 +1219,8 @@ VALUE build_class_from_descriptor(VALUE descriptor) {
|
|
1201
1219
|
klass = rb_define_class_id(
|
1202
1220
|
// Docs say this parameter is ignored. User will assign return value to
|
1203
1221
|
// their own toplevel constant class name.
|
1204
|
-
rb_intern("Message"),
|
1222
|
+
rb_intern("Message"), cAbstractMessage);
|
1205
1223
|
rb_ivar_set(klass, descriptor_instancevar_interned, descriptor);
|
1206
|
-
rb_define_alloc_func(klass, Message_alloc);
|
1207
|
-
rb_require("google/protobuf/message_exts");
|
1208
|
-
rb_include_module(klass, rb_eval_string("::Google::Protobuf::MessageExts"));
|
1209
|
-
rb_extend_object(
|
1210
|
-
klass, rb_eval_string("::Google::Protobuf::MessageExts::ClassMethods"));
|
1211
|
-
|
1212
|
-
rb_define_method(klass, "method_missing", Message_method_missing, -1);
|
1213
|
-
rb_define_method(klass, "respond_to_missing?", Message_respond_to_missing,
|
1214
|
-
-1);
|
1215
|
-
rb_define_method(klass, "initialize", Message_initialize, -1);
|
1216
|
-
rb_define_method(klass, "dup", Message_dup, 0);
|
1217
|
-
// Also define #clone so that we don't inherit Object#clone.
|
1218
|
-
rb_define_method(klass, "clone", Message_dup, 0);
|
1219
|
-
rb_define_method(klass, "==", Message_eq, 1);
|
1220
|
-
rb_define_method(klass, "eql?", Message_eq, 1);
|
1221
|
-
rb_define_method(klass, "freeze", Message_freeze, 0);
|
1222
|
-
rb_define_method(klass, "hash", Message_hash, 0);
|
1223
|
-
rb_define_method(klass, "to_h", Message_to_h, 0);
|
1224
|
-
rb_define_method(klass, "inspect", Message_inspect, 0);
|
1225
|
-
rb_define_method(klass, "to_s", Message_inspect, 0);
|
1226
|
-
rb_define_method(klass, "[]", Message_index, 1);
|
1227
|
-
rb_define_method(klass, "[]=", Message_index_set, 2);
|
1228
|
-
rb_define_singleton_method(klass, "decode", Message_decode, -1);
|
1229
|
-
rb_define_singleton_method(klass, "encode", Message_encode, -1);
|
1230
|
-
rb_define_singleton_method(klass, "decode_json", Message_decode_json, -1);
|
1231
|
-
rb_define_singleton_method(klass, "encode_json", Message_encode_json, -1);
|
1232
|
-
rb_define_singleton_method(klass, "descriptor", Message_descriptor, 0);
|
1233
|
-
|
1234
1224
|
return klass;
|
1235
1225
|
}
|
1236
1226
|
|
@@ -1290,15 +1280,22 @@ VALUE build_module_from_enumdesc(VALUE _enumdesc) {
|
|
1290
1280
|
int n = upb_EnumDef_ValueCount(e);
|
1291
1281
|
for (int i = 0; i < n; i++) {
|
1292
1282
|
const upb_EnumValueDef* ev = upb_EnumDef_Value(e, i);
|
1293
|
-
|
1283
|
+
upb_Arena* arena = upb_Arena_New();
|
1284
|
+
const char* src_name = upb_EnumValueDef_Name(ev);
|
1285
|
+
char* name = upb_strdup2(src_name, strlen(src_name), arena);
|
1294
1286
|
int32_t value = upb_EnumValueDef_Number(ev);
|
1295
1287
|
if (name[0] < 'A' || name[0] > 'Z') {
|
1296
|
-
|
1297
|
-
|
1298
|
-
|
1299
|
-
|
1288
|
+
if (name[0] >= 'a' && name[0] <= 'z') {
|
1289
|
+
name[0] -= 32; // auto capitalize
|
1290
|
+
} else {
|
1291
|
+
rb_warn(
|
1292
|
+
"Enum value '%s' does not start with an uppercase letter "
|
1293
|
+
"as is required for Ruby constants.",
|
1294
|
+
name);
|
1295
|
+
}
|
1300
1296
|
}
|
1301
1297
|
rb_define_const(mod, name, INT2NUM(value));
|
1298
|
+
upb_Arena_Free(arena);
|
1302
1299
|
}
|
1303
1300
|
|
1304
1301
|
rb_define_singleton_method(mod, "lookup", enum_lookup, 1);
|
@@ -1309,7 +1306,7 @@ VALUE build_module_from_enumdesc(VALUE _enumdesc) {
|
|
1309
1306
|
return mod;
|
1310
1307
|
}
|
1311
1308
|
|
1312
|
-
// Internal
|
1309
|
+
// Internal to the library; used by Google::Protobuf.deep_copy.
|
1313
1310
|
upb_Message* Message_deep_copy(const upb_Message* msg, const upb_MessageDef* m,
|
1314
1311
|
upb_Arena* arena) {
|
1315
1312
|
// Serialize and parse.
|
@@ -1317,11 +1314,13 @@ upb_Message* Message_deep_copy(const upb_Message* msg, const upb_MessageDef* m,
|
|
1317
1314
|
const upb_MiniTable* layout = upb_MessageDef_MiniTable(m);
|
1318
1315
|
size_t size;
|
1319
1316
|
|
1320
|
-
|
1321
|
-
|
1317
|
+
upb_Message* new_msg = upb_Message_New(layout, arena);
|
1318
|
+
char* data;
|
1322
1319
|
|
1323
|
-
if (
|
1324
|
-
|
1320
|
+
if (upb_Encode(msg, layout, 0, tmp_arena, &data, &size) !=
|
1321
|
+
kUpb_EncodeStatus_Ok ||
|
1322
|
+
upb_Decode(data, size, new_msg, layout, NULL, 0, arena) !=
|
1323
|
+
kUpb_DecodeStatus_Ok) {
|
1325
1324
|
upb_Arena_Free(tmp_arena);
|
1326
1325
|
rb_raise(cParseError, "Error occurred copying proto");
|
1327
1326
|
}
|
@@ -1348,7 +1347,8 @@ const upb_Message* Message_GetUpbMessage(VALUE value, const upb_MessageDef* m,
|
|
1348
1347
|
switch (upb_MessageDef_WellKnownType(m)) {
|
1349
1348
|
case kUpb_WellKnown_Timestamp: {
|
1350
1349
|
// Time -> Google::Protobuf::Timestamp
|
1351
|
-
|
1350
|
+
const upb_MiniTable* t = upb_MessageDef_MiniTable(m);
|
1351
|
+
upb_Message* msg = upb_Message_New(t, arena);
|
1352
1352
|
upb_MessageValue sec, nsec;
|
1353
1353
|
struct timespec time;
|
1354
1354
|
const upb_FieldDef* sec_f = upb_MessageDef_FindFieldByNumber(m, 1);
|
@@ -1359,13 +1359,14 @@ const upb_Message* Message_GetUpbMessage(VALUE value, const upb_MessageDef* m,
|
|
1359
1359
|
time = rb_time_timespec(value);
|
1360
1360
|
sec.int64_val = time.tv_sec;
|
1361
1361
|
nsec.int32_val = time.tv_nsec;
|
1362
|
-
|
1363
|
-
|
1362
|
+
upb_Message_SetFieldByDef(msg, sec_f, sec, arena);
|
1363
|
+
upb_Message_SetFieldByDef(msg, nsec_f, nsec, arena);
|
1364
1364
|
return msg;
|
1365
1365
|
}
|
1366
1366
|
case kUpb_WellKnown_Duration: {
|
1367
1367
|
// Numeric -> Google::Protobuf::Duration
|
1368
|
-
|
1368
|
+
const upb_MiniTable* t = upb_MessageDef_MiniTable(m);
|
1369
|
+
upb_Message* msg = upb_Message_New(t, arena);
|
1369
1370
|
upb_MessageValue sec, nsec;
|
1370
1371
|
const upb_FieldDef* sec_f = upb_MessageDef_FindFieldByNumber(m, 1);
|
1371
1372
|
const upb_FieldDef* nsec_f = upb_MessageDef_FindFieldByNumber(m, 2);
|
@@ -1374,8 +1375,8 @@ const upb_Message* Message_GetUpbMessage(VALUE value, const upb_MessageDef* m,
|
|
1374
1375
|
|
1375
1376
|
sec.int64_val = NUM2LL(value);
|
1376
1377
|
nsec.int32_val = round((NUM2DBL(value) - NUM2LL(value)) * 1000000000);
|
1377
|
-
|
1378
|
-
|
1378
|
+
upb_Message_SetFieldByDef(msg, sec_f, sec, arena);
|
1379
|
+
upb_Message_SetFieldByDef(msg, nsec_f, nsec, arena);
|
1379
1380
|
return msg;
|
1380
1381
|
}
|
1381
1382
|
default:
|
@@ -1392,11 +1393,42 @@ const upb_Message* Message_GetUpbMessage(VALUE value, const upb_MessageDef* m,
|
|
1392
1393
|
return self->msg;
|
1393
1394
|
}
|
1394
1395
|
|
1396
|
+
static void Message_define_class(VALUE klass) {
|
1397
|
+
rb_define_alloc_func(klass, Message_alloc);
|
1398
|
+
|
1399
|
+
rb_require("google/protobuf/message_exts");
|
1400
|
+
rb_define_method(klass, "method_missing", Message_method_missing, -1);
|
1401
|
+
rb_define_method(klass, "respond_to_missing?", Message_respond_to_missing,
|
1402
|
+
-1);
|
1403
|
+
rb_define_method(klass, "initialize", Message_initialize, -1);
|
1404
|
+
rb_define_method(klass, "dup", Message_dup, 0);
|
1405
|
+
// Also define #clone so that we don't inherit Object#clone.
|
1406
|
+
rb_define_method(klass, "clone", Message_dup, 0);
|
1407
|
+
rb_define_method(klass, "==", Message_eq, 1);
|
1408
|
+
rb_define_method(klass, "eql?", Message_eq, 1);
|
1409
|
+
rb_define_method(klass, "freeze", Message_freeze, 0);
|
1410
|
+
rb_define_method(klass, "hash", Message_hash, 0);
|
1411
|
+
rb_define_method(klass, "to_h", Message_to_h, 0);
|
1412
|
+
rb_define_method(klass, "inspect", Message_inspect, 0);
|
1413
|
+
rb_define_method(klass, "to_s", Message_inspect, 0);
|
1414
|
+
rb_define_method(klass, "[]", Message_index, 1);
|
1415
|
+
rb_define_method(klass, "[]=", Message_index_set, 2);
|
1416
|
+
rb_define_singleton_method(klass, "decode", Message_decode, -1);
|
1417
|
+
rb_define_singleton_method(klass, "encode", Message_encode, -1);
|
1418
|
+
rb_define_singleton_method(klass, "decode_json", Message_decode_json, -1);
|
1419
|
+
rb_define_singleton_method(klass, "encode_json", Message_encode_json, -1);
|
1420
|
+
rb_define_singleton_method(klass, "descriptor", Message_descriptor, 0);
|
1421
|
+
}
|
1422
|
+
|
1395
1423
|
void Message_register(VALUE protobuf) {
|
1396
1424
|
cParseError = rb_const_get(protobuf, rb_intern("ParseError"));
|
1425
|
+
cAbstractMessage =
|
1426
|
+
rb_define_class_under(protobuf, "AbstractMessage", rb_cObject);
|
1427
|
+
Message_define_class(cAbstractMessage);
|
1428
|
+
rb_gc_register_address(&cAbstractMessage);
|
1397
1429
|
|
1398
1430
|
// Ruby-interned string: "descriptor". We use this identifier to store an
|
1399
1431
|
// instance variable on message classes we create in order to link them back
|
1400
1432
|
// to their descriptors.
|
1401
|
-
descriptor_instancevar_interned = rb_intern("descriptor");
|
1433
|
+
descriptor_instancevar_interned = rb_intern("@descriptor");
|
1402
1434
|
}
|
File without changes
|
@@ -171,6 +171,8 @@ void StringBuilder_PrintMsgval(StringBuilder *b, upb_MessageValue val,
|
|
171
171
|
|
172
172
|
typedef struct {
|
173
173
|
upb_Arena *arena;
|
174
|
+
// IMPORTANT: WB_PROTECTED objects must only use the RB_OBJ_WRITE()
|
175
|
+
// macro to update VALUE references, as to trigger write barriers.
|
174
176
|
VALUE pinned_objs;
|
175
177
|
} Arena;
|
176
178
|
|
@@ -190,7 +192,7 @@ static VALUE cArena;
|
|
190
192
|
const rb_data_type_t Arena_type = {
|
191
193
|
"Google::Protobuf::Internal::Arena",
|
192
194
|
{Arena_mark, Arena_free, NULL},
|
193
|
-
.flags = RUBY_TYPED_FREE_IMMEDIATELY,
|
195
|
+
.flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
|
194
196
|
};
|
195
197
|
|
196
198
|
static void* ruby_upb_allocfunc(upb_alloc* alloc, void* ptr, size_t oldsize, size_t size) {
|
@@ -233,7 +235,7 @@ void Arena_Pin(VALUE _arena, VALUE obj) {
|
|
233
235
|
Arena *arena;
|
234
236
|
TypedData_Get_Struct(_arena, Arena, &Arena_type, arena);
|
235
237
|
if (arena->pinned_objs == Qnil) {
|
236
|
-
arena->pinned_objs
|
238
|
+
RB_OBJ_WRITE(_arena, &arena->pinned_objs, rb_ary_new());
|
237
239
|
}
|
238
240
|
rb_ary_push(arena->pinned_objs, obj);
|
239
241
|
}
|
File without changes
|
File without changes
|
File without changes
|