Remove noisy LOG statement in Message Differencer

PiperOrigin-RevId: 504871200
pull/11574/head
Mike Kruskal 2 years ago committed by Copybara-Service
parent d5d5567577
commit 75088504b0
  1. 1497
      php/ext/google/protobuf/php-upb.c
  2. 115
      php/ext/google/protobuf/php-upb.h
  3. 50
      ruby/ext/google/protobuf_c/ruby-upb.c
  4. 1
      src/google/protobuf/util/message_differencer.cc

File diff suppressed because it is too large Load Diff

@ -3369,10 +3369,8 @@ extern const upb_MiniTableEnum google_protobuf_FieldDescriptorProto_Label_enum_i
extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init; extern const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init;
extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init; extern const upb_MiniTableEnum google_protobuf_FieldOptions_CType_enum_init;
extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init; extern const upb_MiniTableEnum google_protobuf_FieldOptions_JSType_enum_init;
extern const upb_MiniTableEnum extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionRetention_enum_init;
google_protobuf_FieldOptions_OptionRetention_enum_init; extern const upb_MiniTableEnum google_protobuf_FieldOptions_OptionTargetType_enum_init;
extern const upb_MiniTableEnum
google_protobuf_FieldOptions_OptionTargetType_enum_init;
extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init; extern const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init;
extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init; extern const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init;
@ -6468,80 +6466,42 @@ UPB_INLINE bool google_protobuf_FieldOptions_has_debug_redact(const google_proto
const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
return _upb_Message_HasNonExtensionField(msg, &field); return _upb_Message_HasNonExtensionField(msg, &field);
} }
UPB_INLINE void google_protobuf_FieldOptions_clear_retention( UPB_INLINE void google_protobuf_FieldOptions_clear_retention(google_protobuf_FieldOptions* msg) {
google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = {17, 20, 9, 2, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
const upb_MiniTableField field = {
17, 20,
9, 2,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_ClearNonExtensionField(msg, &field); _upb_Message_ClearNonExtensionField(msg, &field);
} }
UPB_INLINE int32_t google_protobuf_FieldOptions_retention( UPB_INLINE int32_t google_protobuf_FieldOptions_retention(const google_protobuf_FieldOptions* msg) {
const google_protobuf_FieldOptions* msg) {
int32_t default_val = 0; int32_t default_val = 0;
int32_t ret; int32_t ret;
const upb_MiniTableField field = { const upb_MiniTableField field = {17, 20, 9, 2, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
17, 20,
9, 2,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
return ret; return ret;
} }
UPB_INLINE bool google_protobuf_FieldOptions_has_retention( UPB_INLINE bool google_protobuf_FieldOptions_has_retention(const google_protobuf_FieldOptions* msg) {
const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = {17, 20, 9, 2, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
const upb_MiniTableField field = {
17, 20,
9, 2,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
return _upb_Message_HasNonExtensionField(msg, &field); return _upb_Message_HasNonExtensionField(msg, &field);
} }
UPB_INLINE void google_protobuf_FieldOptions_clear_target( UPB_INLINE void google_protobuf_FieldOptions_clear_target(google_protobuf_FieldOptions* msg) {
google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = {18, 24, 10, 3, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
const upb_MiniTableField field = {
18, 24,
10, 3,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_ClearNonExtensionField(msg, &field); _upb_Message_ClearNonExtensionField(msg, &field);
} }
UPB_INLINE int32_t UPB_INLINE int32_t google_protobuf_FieldOptions_target(const google_protobuf_FieldOptions* msg) {
google_protobuf_FieldOptions_target(const google_protobuf_FieldOptions* msg) {
int32_t default_val = 0; int32_t default_val = 0;
int32_t ret; int32_t ret;
const upb_MiniTableField field = { const upb_MiniTableField field = {18, 24, 10, 3, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
18, 24,
10, 3,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret); _upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
return ret; return ret;
} }
UPB_INLINE bool google_protobuf_FieldOptions_has_target( UPB_INLINE bool google_protobuf_FieldOptions_has_target(const google_protobuf_FieldOptions* msg) {
const google_protobuf_FieldOptions* msg) { const upb_MiniTableField field = {18, 24, 10, 3, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
const upb_MiniTableField field = {
18, 24,
10, 3,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
return _upb_Message_HasNonExtensionField(msg, &field); return _upb_Message_HasNonExtensionField(msg, &field);
} }
UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_protobuf_FieldOptions* msg) { UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(google_protobuf_FieldOptions* msg) {
const upb_MiniTableField field = { const upb_MiniTableField field = {999, UPB_SIZE(28, 32), 0, 4, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
999,
UPB_SIZE(28, 32),
0,
4,
11,
kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)
<< kUpb_FieldRep_Shift)};
_upb_Message_ClearNonExtensionField(msg, &field); _upb_Message_ClearNonExtensionField(msg, &field);
} }
UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* size) { UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* size) {
const upb_MiniTableField field = { const upb_MiniTableField field = {999, UPB_SIZE(28, 32), 0, 4, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
999,
UPB_SIZE(28, 32),
0,
4,
11,
kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)
<< kUpb_FieldRep_Shift)};
const upb_Array* arr = upb_Message_GetArray(msg, &field); const upb_Array* arr = upb_Message_GetArray(msg, &field);
if (arr) { if (arr) {
if (size) *size = arr->size; if (size) *size = arr->size;
@ -6589,31 +6549,16 @@ UPB_INLINE void google_protobuf_FieldOptions_set_debug_redact(google_protobuf_Fi
const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)}; const upb_MiniTableField field = {16, 18, 8, kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)};
_upb_Message_SetNonExtensionField(msg, &field, &value); _upb_Message_SetNonExtensionField(msg, &field, &value);
} }
UPB_INLINE void google_protobuf_FieldOptions_set_retention( UPB_INLINE void google_protobuf_FieldOptions_set_retention(google_protobuf_FieldOptions *msg, int32_t value) {
google_protobuf_FieldOptions* msg, int32_t value) { const upb_MiniTableField field = {17, 20, 9, 2, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
const upb_MiniTableField field = {
17, 20,
9, 2,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_SetNonExtensionField(msg, &field, &value); _upb_Message_SetNonExtensionField(msg, &field, &value);
} }
UPB_INLINE void google_protobuf_FieldOptions_set_target( UPB_INLINE void google_protobuf_FieldOptions_set_target(google_protobuf_FieldOptions *msg, int32_t value) {
google_protobuf_FieldOptions* msg, int32_t value) { const upb_MiniTableField field = {18, 24, 10, 3, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
const upb_MiniTableField field = {
18, 24,
10, 3,
14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)};
_upb_Message_SetNonExtensionField(msg, &field, &value); _upb_Message_SetNonExtensionField(msg, &field, &value);
} }
UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) { UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* size) {
upb_MiniTableField field = { upb_MiniTableField field = {999, UPB_SIZE(28, 32), 0, 4, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
999,
UPB_SIZE(28, 32),
0,
4,
11,
kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)
<< kUpb_FieldRep_Shift)};
upb_Array* arr = upb_Message_GetMutableArray(msg, &field); upb_Array* arr = upb_Message_GetMutableArray(msg, &field);
if (arr) { if (arr) {
if (size) *size = arr->size; if (size) *size = arr->size;
@ -6624,25 +6569,11 @@ UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mu
} }
} }
UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) { UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t size, upb_Arena* arena) {
upb_MiniTableField field = { upb_MiniTableField field = {999, UPB_SIZE(28, 32), 0, 4, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
999,
UPB_SIZE(28, 32),
0,
4,
11,
kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)
<< kUpb_FieldRep_Shift)};
return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArray(msg, &field, size, arena); return (google_protobuf_UninterpretedOption**)upb_Message_ResizeArray(msg, &field, size, arena);
} }
UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) { UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
upb_MiniTableField field = { upb_MiniTableField field = {999, UPB_SIZE(28, 32), 0, 4, 11, kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
999,
UPB_SIZE(28, 32),
0,
4,
11,
kUpb_FieldMode_Array | (UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte)
<< kUpb_FieldRep_Shift)};
upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena); upb_Array* arr = upb_Message_GetOrCreateMutableArray(msg, &field, arena);
if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) { if (!arr || !_upb_Array_ResizeUninitialized(arr, arr->size + 1, arena)) {
return NULL; return NULL;

@ -1758,36 +1758,34 @@ const upb_MiniTableEnum google_protobuf_FileOptions_OptimizeMode_enum_init = {
}, },
}; };
const upb_MiniTableEnum const upb_MiniTableEnum google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = {
google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init = { 64,
64, 0,
0, {
{ 0x7,
0x7, 0x0,
0x0, },
},
}; };
const upb_MiniTableEnum const upb_MiniTableEnum google_protobuf_MethodOptions_IdempotencyLevel_enum_init = {
google_protobuf_MethodOptions_IdempotencyLevel_enum_init = { 64,
64, 0,
0, {
{ 0x7,
0x7, 0x0,
0x0, },
},
}; };
static const upb_MiniTableEnum* enums_layout[9] = { static const upb_MiniTableEnum *enums_layout[9] = {
&google_protobuf_FieldDescriptorProto_Label_enum_init, &google_protobuf_FieldDescriptorProto_Label_enum_init,
&google_protobuf_FieldDescriptorProto_Type_enum_init, &google_protobuf_FieldDescriptorProto_Type_enum_init,
&google_protobuf_FieldOptions_CType_enum_init, &google_protobuf_FieldOptions_CType_enum_init,
&google_protobuf_FieldOptions_JSType_enum_init, &google_protobuf_FieldOptions_JSType_enum_init,
&google_protobuf_FieldOptions_OptionRetention_enum_init, &google_protobuf_FieldOptions_OptionRetention_enum_init,
&google_protobuf_FieldOptions_OptionTargetType_enum_init, &google_protobuf_FieldOptions_OptionTargetType_enum_init,
&google_protobuf_FileOptions_OptimizeMode_enum_init, &google_protobuf_FileOptions_OptimizeMode_enum_init,
&google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init, &google_protobuf_GeneratedCodeInfo_Annotation_Semantic_enum_init,
&google_protobuf_MethodOptions_IdempotencyLevel_enum_init, &google_protobuf_MethodOptions_IdempotencyLevel_enum_init,
}; };
const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = { const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {

@ -1494,7 +1494,6 @@ bool MessageDifferencer::UnpackAnyField::UnpackAny(
any.GetDescriptor()->file()->pool()->FindMessageTypeByName( any.GetDescriptor()->file()->pool()->FindMessageTypeByName(
full_type_name); full_type_name);
if (desc == NULL) { if (desc == NULL) {
ABSL_LOG(INFO) << "Proto type '" << full_type_name << "' not found";
return false; return false;
} }

Loading…
Cancel
Save