|
|
|
// Protocol Buffers - Google's data interchange format
|
|
|
|
// Copyright 2023 Google LLC. All rights reserved.
|
|
|
|
//
|
|
|
|
// Use of this source code is governed by a BSD-style
|
|
|
|
// license that can be found in the LICENSE file or at
|
|
|
|
// https://developers.google.com/open-source/licenses/bsd
|
|
|
|
|
|
|
|
/* Test of mini table accessors.
|
|
|
|
*
|
|
|
|
* Messages are created and mutated using generated code, and then
|
|
|
|
* accessed through reflective APIs exposed through mini table accessors.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "upb/message/accessors.h"
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include <cstddef>
|
|
|
|
#include <cstdint>
|
|
|
|
#include <string>
|
|
|
|
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include "google/protobuf/test_messages_proto2.upb.h"
|
|
|
|
#include "google/protobuf/test_messages_proto2.upb_minitable.h"
|
|
|
|
#include "google/protobuf/test_messages_proto3.upb.h"
|
|
|
|
#include "google/protobuf/test_messages_proto3.upb_minitable.h"
|
|
|
|
#include "upb/base/descriptor_constants.h"
|
|
|
|
#include "upb/base/status.h"
|
|
|
|
#include "upb/base/string_view.h"
|
|
|
|
#include "upb/mem/arena.h"
|
|
|
|
#include "upb/message/array.h"
|
|
|
|
#include "upb/message/message.h"
|
|
|
|
#include "upb/mini_descriptor/decode.h"
|
|
|
|
#include "upb/mini_descriptor/internal/encode.hpp"
|
|
|
|
#include "upb/mini_descriptor/internal/modifiers.h"
|
|
|
|
#include "upb/mini_table/field.h"
|
|
|
|
#include "upb/mini_table/message.h"
|
|
|
|
|
|
|
|
// Must be last
|
|
|
|
#include "upb/port/def.inc"
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
// Proto2 test messages field numbers used for reflective access.
|
|
|
|
const uint32_t kFieldOptionalInt32 = 1;
|
|
|
|
const uint32_t kFieldOptionalUInt32 = 3;
|
|
|
|
const uint32_t kFieldOptionalBool = 13;
|
|
|
|
const uint32_t kFieldOptionalString = 14;
|
|
|
|
const uint32_t kFieldOptionalNestedMessage = 18;
|
|
|
|
const uint32_t kFieldOptionalRepeatedInt32 = 31;
|
|
|
|
const uint32_t kFieldOptionalNestedMessageA = 1;
|
|
|
|
const uint32_t kFieldOptionalOneOfUInt32 = 111;
|
|
|
|
const uint32_t kFieldOptionalOneOfString = 113;
|
|
|
|
|
|
|
|
const uint32_t kFieldProto3OptionalInt64 = 2;
|
|
|
|
const uint32_t kFieldProto3OptionalUInt64 = 4;
|
|
|
|
|
|
|
|
const char kTestStr1[] = "Hello1";
|
|
|
|
const char kTestStr2[] = "Hello2";
|
|
|
|
const int32_t kTestInt32 = 567;
|
|
|
|
const int32_t kTestUInt32 = 0xF1234567;
|
|
|
|
const uint64_t kTestUInt64 = 0xFEDCBAFF87654321;
|
|
|
|
|
|
|
|
const upb_MiniTableField* find_proto3_field(int field_number) {
|
|
|
|
return upb_MiniTable_FindFieldByNumber(
|
|
|
|
&protobuf_0test_0messages__proto3__TestAllTypesProto3_msg_init,
|
|
|
|
field_number);
|
|
|
|
}
|
|
|
|
|
|
|
|
const upb_MiniTableField* find_proto2_field(int field_number) {
|
|
|
|
return upb_MiniTable_FindFieldByNumber(
|
|
|
|
&protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
|
|
|
|
field_number);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(GeneratedCode, HazzersProto2) {
|
|
|
|
upb_Arena* arena = upb_Arena_New();
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2* msg =
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
|
|
|
|
|
|
|
|
// Scalar/Boolean.
|
|
|
|
const upb_MiniTableField* optional_bool_field =
|
|
|
|
find_proto2_field(kFieldOptionalBool);
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_bool_field));
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_bool(msg, true);
|
|
|
|
EXPECT_EQ(true, upb_Message_HasField(msg, optional_bool_field));
|
|
|
|
upb_Message_ClearField(msg, optional_bool_field);
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_bool_field));
|
|
|
|
EXPECT_EQ(
|
|
|
|
false,
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_optional_bool(msg));
|
|
|
|
|
|
|
|
// String.
|
|
|
|
const upb_MiniTableField* optional_string_field =
|
|
|
|
find_proto2_field(kFieldOptionalString);
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_string_field));
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_string(
|
|
|
|
msg, upb_StringView_FromString(kTestStr1));
|
|
|
|
EXPECT_EQ(true, upb_Message_HasField(msg, optional_string_field));
|
|
|
|
EXPECT_EQ(
|
|
|
|
strlen(kTestStr1),
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_optional_string(msg)
|
|
|
|
.size);
|
|
|
|
upb_Message_ClearField(msg, optional_string_field);
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_string_field));
|
|
|
|
EXPECT_EQ(
|
|
|
|
0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_string(msg)
|
|
|
|
.size);
|
|
|
|
|
|
|
|
// Message.
|
|
|
|
const upb_MiniTableField* optional_message_field =
|
|
|
|
find_proto2_field(kFieldOptionalNestedMessage);
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_message_field));
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_mutable_optional_nested_message(
|
|
|
|
msg, arena);
|
|
|
|
EXPECT_EQ(true, upb_Message_HasField(msg, optional_message_field));
|
|
|
|
upb_Message_ClearField(msg, optional_message_field);
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_message_field));
|
|
|
|
EXPECT_EQ(
|
|
|
|
true,
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_optional_nested_message(
|
|
|
|
msg) == nullptr);
|
|
|
|
|
|
|
|
// One of.
|
|
|
|
const upb_MiniTableField* optional_oneof_uint32_field =
|
|
|
|
find_proto2_field(kFieldOptionalOneOfUInt32);
|
|
|
|
const upb_MiniTableField* optional_oneof_string_field =
|
|
|
|
find_proto2_field(kFieldOptionalOneOfString);
|
|
|
|
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_uint32_field));
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_string_field));
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_set_oneof_uint32(msg, 123);
|
|
|
|
EXPECT_EQ(true, upb_Message_HasField(msg, optional_oneof_uint32_field));
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_string_field));
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_set_oneof_string(
|
|
|
|
msg, upb_StringView_FromString(kTestStr1));
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_uint32_field));
|
|
|
|
EXPECT_EQ(true, upb_Message_HasField(msg, optional_oneof_string_field));
|
|
|
|
upb_Message_ClearField(msg, optional_oneof_uint32_field);
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_uint32_field));
|
|
|
|
EXPECT_EQ(true, upb_Message_HasField(msg, optional_oneof_string_field));
|
|
|
|
upb_Message_ClearField(msg, optional_oneof_string_field);
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_uint32_field));
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_oneof_string_field));
|
|
|
|
|
|
|
|
upb_Arena_Free(arena);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(GeneratedCode, ScalarsProto2) {
|
|
|
|
upb_Arena* arena = upb_Arena_New();
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2* msg =
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
|
|
|
|
|
|
|
|
const upb_MiniTableField* optional_int32_field =
|
|
|
|
find_proto2_field(kFieldOptionalInt32);
|
|
|
|
|
|
|
|
EXPECT_EQ(
|
|
|
|
0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_int32(msg));
|
|
|
|
|
|
|
|
EXPECT_EQ(0, upb_Message_GetInt32(msg, optional_int32_field, 0));
|
|
|
|
upb_Message_SetInt32(msg, optional_int32_field, kTestInt32, nullptr);
|
|
|
|
EXPECT_EQ(true, upb_Message_HasField(msg, optional_int32_field));
|
|
|
|
EXPECT_EQ(kTestInt32, upb_Message_GetInt32(msg, optional_int32_field, 0));
|
|
|
|
EXPECT_EQ(
|
|
|
|
kTestInt32,
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_optional_int32(msg));
|
|
|
|
|
|
|
|
const upb_MiniTableField* optional_uint32_field =
|
|
|
|
find_proto2_field(kFieldOptionalUInt32);
|
|
|
|
|
|
|
|
EXPECT_EQ(
|
|
|
|
0, protobuf_test_messages_proto2_TestAllTypesProto2_optional_uint32(msg));
|
|
|
|
EXPECT_EQ(0, upb_Message_GetUInt32(msg, optional_uint32_field, 0));
|
|
|
|
upb_Message_SetUInt32(msg, optional_uint32_field, kTestUInt32, nullptr);
|
|
|
|
EXPECT_EQ(kTestUInt32, upb_Message_GetUInt32(msg, optional_uint32_field, 0));
|
|
|
|
EXPECT_EQ(
|
|
|
|
kTestUInt32,
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_optional_uint32(msg));
|
|
|
|
|
|
|
|
upb_Arena_Free(arena);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(GeneratedCode, ScalarProto3) {
|
|
|
|
upb_Arena* arena = upb_Arena_New();
|
|
|
|
protobuf_test_messages_proto3_TestAllTypesProto3* msg =
|
|
|
|
protobuf_test_messages_proto3_TestAllTypesProto3_new(arena);
|
|
|
|
|
|
|
|
const upb_MiniTableField* optional_int64_field =
|
|
|
|
find_proto3_field(kFieldProto3OptionalInt64);
|
|
|
|
const upb_MiniTableField* optional_uint64_field =
|
|
|
|
find_proto3_field(kFieldProto3OptionalUInt64);
|
|
|
|
|
|
|
|
EXPECT_EQ(
|
|
|
|
0, protobuf_test_messages_proto3_TestAllTypesProto3_optional_int64(msg));
|
|
|
|
upb_Message_SetInt64(msg, optional_int64_field, -1, nullptr);
|
|
|
|
EXPECT_EQ(
|
|
|
|
-1, protobuf_test_messages_proto3_TestAllTypesProto3_optional_int64(msg));
|
|
|
|
EXPECT_EQ(-1, upb_Message_GetInt64(msg, optional_int64_field, 0));
|
|
|
|
|
|
|
|
EXPECT_EQ(
|
|
|
|
0, protobuf_test_messages_proto3_TestAllTypesProto3_optional_uint64(msg));
|
|
|
|
upb_Message_SetUInt64(msg, optional_uint64_field, kTestUInt64, nullptr);
|
|
|
|
EXPECT_EQ(
|
|
|
|
kTestUInt64,
|
|
|
|
protobuf_test_messages_proto3_TestAllTypesProto3_optional_uint64(msg));
|
|
|
|
EXPECT_EQ(kTestUInt64, upb_Message_GetUInt64(msg, optional_uint64_field, 0));
|
|
|
|
|
|
|
|
upb_Arena_Free(arena);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(GeneratedCode, Strings) {
|
|
|
|
upb_Arena* arena = upb_Arena_New();
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2* msg =
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
|
|
|
|
|
|
|
|
const upb_MiniTableField* optional_string_field =
|
|
|
|
find_proto2_field(kFieldOptionalString);
|
|
|
|
|
|
|
|
// Test default.
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_string_field));
|
|
|
|
// Test read after write using C.
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_set_optional_string(
|
|
|
|
msg, upb_StringView_FromString(kTestStr1));
|
|
|
|
EXPECT_EQ(true, upb_Message_HasField(msg, optional_string_field));
|
|
|
|
upb_StringView value = upb_Message_GetString(msg, optional_string_field,
|
|
|
|
upb_StringView{nullptr, 0});
|
|
|
|
std::string read_value = std::string(value.data, value.size);
|
|
|
|
EXPECT_EQ(kTestStr1, read_value);
|
|
|
|
// Clear.
|
|
|
|
upb_Message_ClearField(msg, optional_string_field);
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_string_field));
|
|
|
|
EXPECT_EQ(
|
|
|
|
false,
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_string(
|
|
|
|
msg));
|
|
|
|
upb_Message_SetString(msg, optional_string_field,
|
|
|
|
upb_StringView_FromString(kTestStr2), nullptr);
|
|
|
|
EXPECT_EQ(true, upb_Message_HasField(msg, optional_string_field));
|
|
|
|
EXPECT_EQ(
|
|
|
|
true,
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_has_optional_string(
|
|
|
|
msg));
|
|
|
|
value = protobuf_test_messages_proto2_TestAllTypesProto2_optional_string(msg);
|
|
|
|
read_value = std::string(value.data, value.size);
|
|
|
|
EXPECT_EQ(kTestStr2, read_value);
|
|
|
|
|
|
|
|
upb_Arena_Free(arena);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(GeneratedCode, SubMessage) {
|
|
|
|
upb_Arena* arena = upb_Arena_New();
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2* msg =
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
|
|
|
|
|
|
|
|
const upb_MiniTableField* optional_message_field =
|
|
|
|
find_proto2_field(kFieldOptionalNestedMessage);
|
|
|
|
|
|
|
|
const upb_Message* test_message =
|
|
|
|
upb_Message_GetMessage(msg, optional_message_field, nullptr);
|
|
|
|
EXPECT_EQ(nullptr, test_message);
|
|
|
|
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_message_field));
|
|
|
|
|
|
|
|
// Get mutable using C API.
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage* nested_message =
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_mutable_optional_nested_message(
|
|
|
|
msg, arena);
|
|
|
|
EXPECT_EQ(true, nested_message != nullptr);
|
|
|
|
EXPECT_EQ(true, upb_Message_HasField(msg, optional_message_field));
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_set_a(
|
|
|
|
nested_message, 5);
|
|
|
|
|
|
|
|
// Read back using mini table API.
|
|
|
|
const upb_Message* sub_message =
|
|
|
|
upb_Message_GetMessage(msg, optional_message_field, nullptr);
|
|
|
|
EXPECT_EQ(true, sub_message != nullptr);
|
|
|
|
|
|
|
|
const upb_MiniTableField* nested_message_a_field =
|
|
|
|
upb_MiniTable_FindFieldByNumber(
|
|
|
|
&protobuf_0test_0messages__proto2__TestAllTypesProto2__NestedMessage_msg_init,
|
|
|
|
kFieldOptionalNestedMessageA);
|
|
|
|
EXPECT_EQ(5, upb_Message_GetInt32(sub_message, nested_message_a_field, 0));
|
|
|
|
|
|
|
|
upb_Message_ClearField(msg, optional_message_field);
|
|
|
|
EXPECT_EQ(
|
|
|
|
nullptr,
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_optional_nested_message(
|
|
|
|
msg));
|
|
|
|
EXPECT_EQ(false, upb_Message_HasField(msg, optional_message_field));
|
|
|
|
|
|
|
|
upb_Message* new_nested_message =
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_NestedMessage_new(arena);
|
|
|
|
upb_Message_SetInt32(new_nested_message, nested_message_a_field, 123,
|
|
|
|
nullptr);
|
|
|
|
upb_Message_SetMessage(
|
|
|
|
msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
|
Treat unlinked sub-messages in the MiniTable as unknown
This is an observable behavior change in the decoder. After submitting this CL, clients of the decoder can assume that any unlinked sub-messages will be treated as unknown, rather than crashing.
Unlinked sub-messages must never have values present in the message. We can verify this with asserts. Since the values are never set, the encoder should never encounter data for any unlinked sub-message.
```
name old cpu/op new cpu/op delta
BM_ArenaOneAlloc 18.3ns ± 9% 17.9ns ± 2% ~ (p=0.690 n=5+5)
BM_ArenaInitialBlockOneAlloc 6.40ns ± 1% 6.68ns ±10% ~ (p=0.730 n=4+5)
BM_LoadAdsDescriptor_Upb<NoLayout> 5.09ms ± 2% 5.03ms ± 3% ~ (p=0.222 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 5.45ms ± 3% 5.43ms ± 1% ~ (p=0.905 n=5+4)
BM_LoadAdsDescriptor_Proto2<NoLayout> 10.9ms ± 1% 10.8ms ± 1% -1.09% (p=0.016 n=5+4)
BM_LoadAdsDescriptor_Proto2<WithLayout> 11.3ms ± 9% 11.1ms ± 3% ~ (p=0.841 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Copy> 11.2µs ± 3% 11.3µs ± 3% ~ (p=0.222 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Alias> 10.3µs ± 5% 10.5µs ± 5% ~ (p=0.310 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 11.4µs ±18% 11.0µs ± 2% ~ (p=1.000 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 10.5µs ±17% 10.6µs ±19% ~ (p=0.421 n=5+5)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 20.5µs ± 2% 20.2µs ± 2% ~ (p=0.222 n=5+5)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 10.8µs ± 2% 10.9µs ± 4% ~ (p=0.841 n=5+5)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 10.5µs ± 3% 10.6µs ± 3% ~ (p=0.690 n=5+5)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 9.22µs ± 2% 9.23µs ± 3% ~ (p=1.000 n=5+5)
BM_SerializeDescriptor_Proto2 6.05µs ± 3% 5.90µs ± 3% ~ (p=0.222 n=5+5)
BM_SerializeDescriptor_Upb 10.2µs ± 3% 10.6µs ±14% ~ (p=0.841 n=5+5)
name old time/op new time/op delta
BM_ArenaOneAlloc 18.3ns ± 9% 17.9ns ± 2% ~ (p=0.841 n=5+5)
BM_ArenaInitialBlockOneAlloc 6.42ns ± 1% 6.69ns ±10% ~ (p=0.730 n=4+5)
BM_LoadAdsDescriptor_Upb<NoLayout> 5.10ms ± 2% 5.05ms ± 3% ~ (p=0.222 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 5.47ms ± 3% 5.45ms ± 1% ~ (p=0.905 n=5+4)
BM_LoadAdsDescriptor_Proto2<NoLayout> 10.9ms ± 1% 10.8ms ± 1% -1.11% (p=0.016 n=5+4)
BM_LoadAdsDescriptor_Proto2<WithLayout> 11.4ms ± 9% 11.1ms ± 3% ~ (p=0.841 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Copy> 11.2µs ± 3% 11.3µs ± 3% ~ (p=0.222 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Alias> 10.3µs ± 5% 10.5µs ± 5% ~ (p=0.151 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 11.5µs ±18% 11.0µs ± 2% ~ (p=1.000 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 10.5µs ±17% 10.7µs ±19% ~ (p=0.421 n=5+5)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 20.6µs ± 2% 20.3µs ± 2% ~ (p=0.222 n=5+5)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 10.9µs ± 2% 10.9µs ± 4% ~ (p=0.841 n=5+5)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 10.6µs ± 3% 10.6µs ± 3% ~ (p=0.690 n=5+5)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 9.24µs ± 2% 9.25µs ± 3% ~ (p=1.000 n=5+5)
BM_SerializeDescriptor_Proto2 6.07µs ± 3% 5.91µs ± 3% ~ (p=0.222 n=5+5)
BM_SerializeDescriptor_Upb 10.3µs ± 3% 10.6µs ±14% ~ (p=0.841 n=5+5)
name old INSTRUCTIONS/op new INSTRUCTIONS/op delta
BM_ArenaOneAlloc 201 ± 0% 201 ± 0% ~ (p=0.841 n=5+5)
BM_ArenaInitialBlockOneAlloc 69.0 ± 0% 69.0 ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Upb<NoLayout> 33.9M ± 0% 34.1M ± 0% +0.66% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 35.6M ± 0% 35.8M ± 0% +0.64% (p=0.008 n=5+5)
BM_LoadAdsDescriptor_Proto2<NoLayout> 70.8M ± 0% 70.8M ± 0% ~ (p=0.548 n=5+5)
BM_LoadAdsDescriptor_Proto2<WithLayout> 71.6M ± 0% 71.6M ± 0% ~ (p=0.151 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Copy> 137k ± 0% 141k ± 0% +2.87% (p=0.008 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Alias> 125k ± 0% 128k ± 0% +2.83% (p=0.008 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 135k ± 0% 139k ± 0% +2.89% (p=0.008 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 124k ± 0% 127k ± 0% +2.85% (p=0.016 n=5+4)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 201k ± 0% 201k ± 0% ~ (p=0.222 n=5+5)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 107k ± 0% 107k ± 0% ~ (p=1.000 n=5+5)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 105k ± 0% 105k ± 0% ~ (p=0.286 n=5+4)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 86.5k ± 0% 86.5k ± 0% ~ (p=0.222 n=5+5)
BM_SerializeDescriptor_Proto2 60.3k ± 0% 60.3k ± 0% ~ (p=0.071 n=5+5)
BM_SerializeDescriptor_Upb 111k ± 0% 111k ± 0% ~ (p=0.841 n=5+5)
name old CYCLES/op new CYCLES/op delta
BM_ArenaOneAlloc 60.0 ± 7% 58.8 ± 0% -2.15% (p=0.016 n=5+5)
BM_ArenaInitialBlockOneAlloc 21.0 ± 0% 21.0 ± 0% ~ (p=1.000 n=5+5)
BM_LoadAdsDescriptor_Upb<NoLayout> 16.9M ± 0% 16.9M ± 0% ~ (p=0.056 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 17.9M ± 1% 18.0M ± 1% ~ (p=0.095 n=5+5)
BM_LoadAdsDescriptor_Proto2<NoLayout> 35.9M ± 1% 35.8M ± 1% ~ (p=0.421 n=5+5)
BM_LoadAdsDescriptor_Proto2<WithLayout> 36.5M ± 0% 36.5M ± 0% ~ (p=0.841 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Copy> 37.2k ± 0% 37.3k ± 0% ~ (p=0.222 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Alias> 34.1k ± 0% 34.7k ± 0% +1.66% (p=0.008 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 36.4k ± 0% 36.7k ± 0% +0.83% (p=0.008 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 33.3k ± 1% 34.1k ± 1% +2.39% (p=0.008 n=5+5)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 68.1k ± 1% 68.0k ± 1% ~ (p=0.421 n=5+5)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 36.0k ± 1% 36.1k ± 1% ~ (p=0.841 n=5+5)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 35.3k ± 1% 35.5k ± 1% ~ (p=0.151 n=5+5)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 30.7k ± 0% 30.9k ± 1% ~ (p=0.151 n=5+5)
BM_SerializeDescriptor_Proto2 20.3k ± 2% 19.7k ± 3% ~ (p=0.151 n=5+5)
BM_SerializeDescriptor_Upb 33.6k ± 0% 33.7k ± 2% ~ (p=1.000 n=5+5)
name old allocs/op new allocs/op delta
BM_ArenaOneAlloc 1.19 ± 0% 1.19 ± 0% ~ (all samples are equal)
BM_ArenaInitialBlockOneAlloc 0.19 ± 0% 0.19 ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Upb<NoLayout> 6.00k ± 0% 6.00k ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Upb<WithLayout> 5.99k ± 0% 5.99k ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Proto2<NoLayout> 77.8k ± 0% 77.8k ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Proto2<WithLayout> 79.0k ± 0% 79.0k ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<UseArena, Copy> 7.19 ± 0% 7.19 ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<UseArena, Alias> 7.19 ± 0% 7.19 ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 0.19 ± 0% 0.19 ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 0.19 ± 0% 0.19 ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 765 ± 0% 765 ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 10.2 ± 0% 10.2 ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 1.19 ± 0% 1.19 ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 1.19 ± 0% 1.19 ± 0% ~ (all samples are equal)
BM_SerializeDescriptor_Proto2 0.19 ± 0% 0.19 ± 0% ~ (all samples are equal)
BM_SerializeDescriptor_Upb 0.19 ± 0% 0.19 ± 0% ~ (all samples are equal)
name old peak-mem(Bytes)/op new peak-mem(Bytes)/op delta
BM_ArenaOneAlloc 344 ± 0% 344 ± 0% ~ (all samples are equal)
BM_ArenaInitialBlockOneAlloc 112 ± 0% 112 ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Upb<NoLayout> 9.64M ± 0% 9.64M ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Upb<WithLayout> 9.70M ± 0% 9.70M ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Proto2<NoLayout> 6.38M ± 0% 6.38M ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Proto2<WithLayout> 6.44M ± 0% 6.44M ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<UseArena, Copy> 36.5k ± 0% 36.5k ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<UseArena, Alias> 36.5k ± 0% 36.5k ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 112 ± 0% 112 ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 112 ± 0% 112 ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 35.8k ± 0% 35.8k ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 40.8k ± 0% 40.8k ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 112 ± 0% 112 ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 112 ± 0% 112 ± 0% ~ (all samples are equal)
BM_SerializeDescriptor_Proto2 112 ± 0% 112 ± 0% ~ (all samples are equal)
BM_SerializeDescriptor_Upb 112 ± 0% 112 ± 0% ~ (all samples are equal)
name old speed new speed delta
BM_LoadAdsDescriptor_Upb<NoLayout> 147MB/s ± 2% 148MB/s ± 3% ~ (p=0.222 n=5+5)
BM_LoadAdsDescriptor_Upb<WithLayout> 137MB/s ± 3% 137MB/s ± 1% ~ (p=0.905 n=5+4)
BM_LoadAdsDescriptor_Proto2<NoLayout> 68.6MB/s ± 1% 69.3MB/s ± 1% +1.10% (p=0.016 n=5+4)
BM_LoadAdsDescriptor_Proto2<WithLayout> 66.0MB/s ± 9% 67.4MB/s ± 3% ~ (p=0.841 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Copy> 675MB/s ± 3% 667MB/s ± 3% ~ (p=0.222 n=5+5)
BM_Parse_Upb_FileDesc<UseArena, Alias> 730MB/s ± 5% 718MB/s ± 5% ~ (p=0.310 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 663MB/s ±16% 685MB/s ± 2% ~ (p=1.000 n=5+5)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 723MB/s ±15% 712MB/s ±16% ~ (p=0.421 n=5+5)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 367MB/s ± 2% 372MB/s ± 2% ~ (p=0.222 n=5+5)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 694MB/s ± 2% 691MB/s ± 4% ~ (p=0.841 n=5+5)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 714MB/s ± 3% 709MB/s ± 3% ~ (p=0.690 n=5+5)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 816MB/s ± 2% 816MB/s ± 3% ~ (p=1.000 n=5+5)
BM_SerializeDescriptor_Proto2 1.24GB/s ± 3% 1.28GB/s ± 3% ~ (p=0.222 n=5+5)
BM_SerializeDescriptor_Upb 734MB/s ± 3% 713MB/s ±13% ~ (p=0.841 n=5+5)
```
PiperOrigin-RevId: 477770562
2 years ago
|
|
|
optional_message_field, new_nested_message);
|
|
|
|
|
|
|
|
upb_Message* mutable_message = upb_Message_GetOrCreateMutableMessage(
|
|
|
|
msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
|
|
|
|
optional_message_field, arena);
|
|
|
|
EXPECT_EQ(
|
|
|
|
true,
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_optional_nested_message(
|
|
|
|
msg) != nullptr);
|
|
|
|
EXPECT_EQ(true, upb_Message_HasField(msg, optional_message_field));
|
|
|
|
EXPECT_EQ(123,
|
|
|
|
upb_Message_GetInt32(mutable_message, nested_message_a_field, 0));
|
|
|
|
|
|
|
|
upb_Arena_Free(arena);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(GeneratedCode, RepeatedScalar) {
|
|
|
|
upb_Arena* arena = upb_Arena_New();
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2* msg =
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
|
|
|
|
|
|
|
|
const upb_MiniTableField* repeated_int32_field =
|
|
|
|
find_proto2_field(kFieldOptionalRepeatedInt32);
|
|
|
|
|
|
|
|
size_t len;
|
|
|
|
const int32_t* arr =
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_repeated_int32(msg,
|
|
|
|
&len);
|
|
|
|
// Test Get/Set Array values, validate with C API.
|
|
|
|
EXPECT_EQ(0, len);
|
|
|
|
EXPECT_EQ(nullptr, arr);
|
|
|
|
EXPECT_EQ(nullptr, upb_Message_GetArray(msg, repeated_int32_field));
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_resize_repeated_int32(
|
|
|
|
msg, 10, arena);
|
|
|
|
int32_t* mutable_values =
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_mutable_repeated_int32(
|
|
|
|
msg, &len);
|
|
|
|
mutable_values[5] = 123;
|
|
|
|
const upb_Array* readonly_arr =
|
|
|
|
upb_Message_GetArray(msg, repeated_int32_field);
|
|
|
|
EXPECT_EQ(123, upb_Array_Get(readonly_arr, 5).int32_val);
|
|
|
|
|
|
|
|
upb_MessageValue new_value;
|
|
|
|
new_value.int32_val = 567;
|
|
|
|
upb_Array* mutable_array =
|
|
|
|
upb_Message_GetMutableArray(msg, repeated_int32_field);
|
|
|
|
upb_Array_Set(mutable_array, 5, new_value);
|
|
|
|
EXPECT_EQ(new_value.int32_val,
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_repeated_int32(
|
|
|
|
msg, &len)[5]);
|
|
|
|
|
|
|
|
// Test resize.
|
|
|
|
bool result = upb_Array_Resize(mutable_array, 20, arena);
|
|
|
|
EXPECT_EQ(true, result);
|
|
|
|
upb_Array_Set(mutable_array, 19, new_value);
|
|
|
|
EXPECT_EQ(new_value.int32_val,
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_repeated_int32(
|
|
|
|
msg, &len)[19]);
|
|
|
|
upb_Array_Resize(mutable_array, 0, arena);
|
|
|
|
const int32_t* zero_length_array =
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_repeated_int32(msg,
|
|
|
|
&len);
|
|
|
|
EXPECT_EQ(0, len);
|
|
|
|
EXPECT_EQ(true, zero_length_array != nullptr);
|
|
|
|
|
|
|
|
upb_Arena_Free(arena);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(GeneratedCode, GetMutableMessage) {
|
|
|
|
upb_Arena* arena = upb_Arena_New();
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2* msg =
|
|
|
|
protobuf_test_messages_proto2_TestAllTypesProto2_new(arena);
|
|
|
|
// Message.
|
|
|
|
const upb_MiniTableField* optional_message_field =
|
|
|
|
find_proto2_field(kFieldOptionalNestedMessage);
|
|
|
|
upb_Message* msg1 = upb_Message_GetOrCreateMutableMessage(
|
|
|
|
msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
|
|
|
|
optional_message_field, arena);
|
|
|
|
upb_Message* msg2 = upb_Message_GetOrCreateMutableMessage(
|
|
|
|
msg, &protobuf_0test_0messages__proto2__TestAllTypesProto2_msg_init,
|
|
|
|
optional_message_field, arena);
|
|
|
|
// Verify that newly constructed sub message is stored in msg.
|
|
|
|
EXPECT_EQ(msg1, msg2);
|
|
|
|
|
|
|
|
upb_Arena_Free(arena);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(GeneratedCode, EnumClosedCheck) {
|
|
|
|
upb_Arena* arena = upb_Arena_New();
|
|
|
|
|
|
|
|
upb::MtDataEncoder e;
|
|
|
|
e.StartMessage(0);
|
|
|
|
e.PutField(kUpb_FieldType_Int32, 4, 0);
|
|
|
|
e.PutField(kUpb_FieldType_Enum, 5, 0);
|
|
|
|
|
|
|
|
upb_Status status;
|
|
|
|
upb_Status_Clear(&status);
|
|
|
|
upb_MiniTable* table =
|
|
|
|
upb_MiniTable_Build(e.data().data(), e.data().size(), arena, &status);
|
|
|
|
|
|
|
|
const upb_MiniTableField* enumField = &table->fields[1];
|
|
|
|
EXPECT_EQ(upb_MiniTableField_Type(enumField), kUpb_FieldType_Enum);
|
|
|
|
EXPECT_FALSE(upb_MiniTableField_IsClosedEnum(enumField));
|
|
|
|
|
|
|
|
upb::MtDataEncoder e2;
|
|
|
|
e2.StartMessage(0);
|
|
|
|
e2.PutField(kUpb_FieldType_Int32, 4, 0);
|
|
|
|
e2.PutField(kUpb_FieldType_Enum, 6, kUpb_FieldModifier_IsClosedEnum);
|
|
|
|
|
|
|
|
upb_Status_Clear(&status);
|
|
|
|
table =
|
|
|
|
upb_MiniTable_Build(e2.data().data(), e2.data().size(), arena, &status);
|
|
|
|
|
|
|
|
const upb_MiniTableField* closedEnumField = &table->fields[1];
|
|
|
|
EXPECT_EQ(upb_MiniTableField_Type(closedEnumField), kUpb_FieldType_Enum);
|
|
|
|
EXPECT_TRUE(upb_MiniTableField_IsClosedEnum(closedEnumField));
|
|
|
|
upb_Arena_Free(arena);
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace
|