|
|
|
// 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
|
|
|
|
|
|
|
|
#include <cstddef>
|
|
|
|
#include <cstdint>
|
|
|
|
#include <string>
|
|
|
|
#include <string_view>
|
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
#include <gmock/gmock.h>
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include "google/protobuf/test_messages_proto3.upb.h"
|
|
|
|
#include "upb/base/status.hpp"
|
|
|
|
#include "upb/base/string_view.h"
|
|
|
|
#include "upb/base/upcast.h"
|
|
|
|
#include "upb/json/decode.h"
|
|
|
|
#include "upb/json/encode.h"
|
|
|
|
#include "upb/mem/arena.h"
|
|
|
|
#include "upb/mem/arena.hpp"
|
|
|
|
#include "upb/message/array.h"
|
|
|
|
#include "upb/message/map.h"
|
|
|
|
#include "upb/message/message.h"
|
|
|
|
#include "upb/message/test.upb.h"
|
|
|
|
#include "upb/message/test.upb_minitable.h"
|
|
|
|
#include "upb/message/test.upbdefs.h"
|
|
|
|
#include "upb/message/value.h"
|
|
|
|
#include "upb/mini_table/extension_registry.h"
|
|
|
|
#include "upb/mini_table/field.h"
|
|
|
|
#include "upb/mini_table/message.h"
|
|
|
|
#include "upb/reflection/def.h"
|
|
|
|
#include "upb/reflection/def.hpp"
|
|
|
|
#include "upb/reflection/message.h"
|
|
|
|
#include "upb/test/fuzz_util.h"
|
|
|
|
#include "upb/wire/decode.h"
|
|
|
|
#include "upb/wire/encode.h"
|
|
|
|
|
|
|
|
// begin:google_only
|
|
|
|
// #include "testing/fuzzing/fuzztest.h"
|
|
|
|
// end:google_only
|
|
|
|
|
|
|
|
void VerifyMessage(const upb_test_TestExtensions* ext_msg) {
|
|
|
|
EXPECT_TRUE(upb_test_TestExtensions_has_optional_int32_ext(ext_msg));
|
|
|
|
// EXPECT_FALSE(upb_test_TestExtensions_Nested_has_optional_int32_ext(ext_msg));
|
|
|
|
EXPECT_TRUE(upb_test_has_optional_msg_ext(ext_msg));
|
|
|
|
|
|
|
|
EXPECT_EQ(123, upb_test_TestExtensions_optional_int32_ext(ext_msg));
|
|
|
|
const protobuf_test_messages_proto3_TestAllTypesProto3* ext_submsg =
|
|
|
|
upb_test_optional_msg_ext(ext_msg);
|
|
|
|
EXPECT_TRUE(ext_submsg != nullptr);
|
|
|
|
EXPECT_EQ(456,
|
|
|
|
protobuf_test_messages_proto3_TestAllTypesProto3_optional_int32(
|
|
|
|
ext_submsg));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(MessageTest, Extensions) {
|
|
|
|
upb::Arena arena;
|
|
|
|
upb_test_TestExtensions* ext_msg = upb_test_TestExtensions_new(arena.ptr());
|
|
|
|
|
|
|
|
EXPECT_FALSE(upb_test_TestExtensions_has_optional_int32_ext(ext_msg));
|
|
|
|
// EXPECT_FALSE(upb_test_TestExtensions_Nested_has_optional_int32_ext(ext_msg));
|
|
|
|
EXPECT_FALSE(upb_test_has_optional_msg_ext(ext_msg));
|
|
|
|
|
|
|
|
upb::DefPool defpool;
|
|
|
|
upb::MessageDefPtr m(upb_test_TestExtensions_getmsgdef(defpool.ptr()));
|
|
|
|
EXPECT_TRUE(m.ptr() != nullptr);
|
|
|
|
|
|
|
|
std::string json = R"json(
|
|
|
|
{
|
|
|
|
"[upb_test.TestExtensions.optional_int32_ext]": 123,
|
|
|
|
"[upb_test.TestExtensions.Nested.repeated_int32_ext]": [2, 4, 6],
|
|
|
|
"[upb_test.optional_msg_ext]": {"optional_int32": 456}
|
|
|
|
}
|
|
|
|
)json";
|
|
|
|
upb::Status status;
|
|
|
|
EXPECT_TRUE(upb_JsonDecode(json.data(), json.size(), UPB_UPCAST(ext_msg),
|
|
|
|
m.ptr(), defpool.ptr(), 0, arena.ptr(),
|
|
|
|
status.ptr()))
|
|
|
|
<< status.error_message();
|
|
|
|
|
|
|
|
VerifyMessage(ext_msg);
|
|
|
|
|
|
|
|
// Test round-trip through binary format.
|
|
|
|
size_t size;
|
|
|
|
char* serialized =
|
|
|
|
upb_test_TestExtensions_serialize(ext_msg, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized != nullptr);
|
|
|
|
ASSERT_GE(size, 0);
|
|
|
|
|
|
|
|
upb_test_TestExtensions* ext_msg2 = upb_test_TestExtensions_parse_ex(
|
|
|
|
serialized, size, upb_DefPool_ExtensionRegistry(defpool.ptr()), 0,
|
|
|
|
arena.ptr());
|
|
|
|
VerifyMessage(ext_msg2);
|
|
|
|
|
|
|
|
// Test round-trip through JSON format.
|
|
|
|
size_t json_size = upb_JsonEncode(UPB_UPCAST(ext_msg), m.ptr(), defpool.ptr(),
|
|
|
|
0, nullptr, 0, status.ptr());
|
|
|
|
char* json_buf =
|
|
|
|
static_cast<char*>(upb_Arena_Malloc(arena.ptr(), json_size + 1));
|
|
|
|
upb_JsonEncode(UPB_UPCAST(ext_msg), m.ptr(), defpool.ptr(), 0, json_buf,
|
|
|
|
json_size + 1, status.ptr());
|
|
|
|
upb_test_TestExtensions* ext_msg3 = upb_test_TestExtensions_new(arena.ptr());
|
|
|
|
EXPECT_TRUE(upb_JsonDecode(json_buf, json_size, UPB_UPCAST(ext_msg3), m.ptr(),
|
|
|
|
defpool.ptr(), 0, arena.ptr(), status.ptr()))
|
|
|
|
<< status.error_message();
|
|
|
|
VerifyMessage(ext_msg3);
|
|
|
|
|
|
|
|
// Test setters and mutable accessors
|
|
|
|
upb_test_TestExtensions* ext_msg4 = upb_test_TestExtensions_new(arena.ptr());
|
|
|
|
upb_test_TestExtensions_set_optional_int32_ext(ext_msg4, 123, arena.ptr());
|
|
|
|
protobuf_test_messages_proto3_TestAllTypesProto3_set_optional_int32(
|
|
|
|
upb_test_mutable_optional_msg_ext(ext_msg4, arena.ptr()), 456);
|
|
|
|
VerifyMessage(ext_msg4);
|
|
|
|
}
|
|
|
|
|
|
|
|
void VerifyMessageSet(const upb_test_TestMessageSet* mset_msg) {
|
|
|
|
ASSERT_TRUE(mset_msg != nullptr);
|
|
|
|
bool has = upb_test_MessageSetMember_has_message_set_extension(mset_msg);
|
|
|
|
EXPECT_TRUE(has);
|
|
|
|
if (!has) return;
|
|
|
|
const upb_test_MessageSetMember* member =
|
|
|
|
upb_test_MessageSetMember_message_set_extension(mset_msg);
|
|
|
|
EXPECT_TRUE(member != nullptr);
|
|
|
|
EXPECT_TRUE(upb_test_MessageSetMember_has_optional_int32(member));
|
|
|
|
EXPECT_EQ(234, upb_test_MessageSetMember_optional_int32(member));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(MessageTest, MessageSet) {
|
|
|
|
upb::Arena arena;
|
|
|
|
upb_test_TestMessageSet* ext_msg = upb_test_TestMessageSet_new(arena.ptr());
|
|
|
|
|
|
|
|
EXPECT_FALSE(upb_test_MessageSetMember_has_message_set_extension(ext_msg));
|
|
|
|
|
|
|
|
upb::DefPool defpool;
|
|
|
|
upb::MessageDefPtr m(upb_test_TestMessageSet_getmsgdef(defpool.ptr()));
|
|
|
|
EXPECT_TRUE(m.ptr() != nullptr);
|
|
|
|
|
|
|
|
std::string json = R"json(
|
|
|
|
{
|
|
|
|
"[upb_test.MessageSetMember]": {"optional_int32": 234}
|
|
|
|
}
|
|
|
|
)json";
|
|
|
|
upb::Status status;
|
|
|
|
EXPECT_TRUE(upb_JsonDecode(json.data(), json.size(), UPB_UPCAST(ext_msg),
|
|
|
|
m.ptr(), defpool.ptr(), 0, arena.ptr(),
|
|
|
|
status.ptr()))
|
|
|
|
<< status.error_message();
|
|
|
|
|
|
|
|
VerifyMessageSet(ext_msg);
|
|
|
|
|
|
|
|
// Test round-trip through binary format.
|
|
|
|
size_t size;
|
|
|
|
char* serialized =
|
|
|
|
upb_test_TestMessageSet_serialize(ext_msg, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized != nullptr);
|
|
|
|
ASSERT_GE(size, 0);
|
|
|
|
|
|
|
|
upb_test_TestMessageSet* ext_msg2 = upb_test_TestMessageSet_parse_ex(
|
|
|
|
serialized, size, upb_DefPool_ExtensionRegistry(defpool.ptr()), 0,
|
|
|
|
arena.ptr());
|
|
|
|
VerifyMessageSet(ext_msg2);
|
|
|
|
|
|
|
|
// Test round-trip through JSON format.
|
|
|
|
size_t json_size = upb_JsonEncode(UPB_UPCAST(ext_msg), m.ptr(), defpool.ptr(),
|
|
|
|
0, nullptr, 0, status.ptr());
|
|
|
|
char* json_buf =
|
|
|
|
static_cast<char*>(upb_Arena_Malloc(arena.ptr(), json_size + 1));
|
|
|
|
upb_JsonEncode(UPB_UPCAST(ext_msg), m.ptr(), defpool.ptr(), 0, json_buf,
|
|
|
|
json_size + 1, status.ptr());
|
|
|
|
upb_test_TestMessageSet* ext_msg3 = upb_test_TestMessageSet_new(arena.ptr());
|
|
|
|
EXPECT_TRUE(upb_JsonDecode(json_buf, json_size, UPB_UPCAST(ext_msg3), m.ptr(),
|
|
|
|
defpool.ptr(), 0, arena.ptr(), status.ptr()))
|
|
|
|
<< status.error_message();
|
|
|
|
VerifyMessageSet(ext_msg3);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(MessageTest, UnknownMessageSet) {
|
|
|
|
static const char data[] = "ABCDE";
|
|
|
|
upb_StringView data_view = upb_StringView_FromString(data);
|
|
|
|
upb::Arena arena;
|
|
|
|
upb_test_FakeMessageSet* fake = upb_test_FakeMessageSet_new(arena.ptr());
|
|
|
|
|
|
|
|
// Add a MessageSet item that is unknown (there is no matching extension in
|
|
|
|
// the .proto file)
|
|
|
|
upb_test_FakeMessageSet_Item* item =
|
|
|
|
upb_test_FakeMessageSet_add_item(fake, arena.ptr());
|
|
|
|
upb_test_FakeMessageSet_Item_set_type_id(item, 12345);
|
|
|
|
upb_test_FakeMessageSet_Item_set_message(item, data_view);
|
|
|
|
|
|
|
|
// Set unknown fields inside the message set to test that we can skip them.
|
|
|
|
upb_test_FakeMessageSet_Item_set_unknown_varint(item, 12345678);
|
|
|
|
upb_test_FakeMessageSet_Item_set_unknown_fixed32(item, 12345678);
|
|
|
|
upb_test_FakeMessageSet_Item_set_unknown_fixed64(item, 12345678);
|
|
|
|
upb_test_FakeMessageSet_Item_set_unknown_bytes(item, data_view);
|
|
|
|
upb_test_FakeMessageSet_Item_mutable_unknowngroup(item, arena.ptr());
|
|
|
|
|
|
|
|
// Round trip through a true MessageSet where this item_id is unknown.
|
|
|
|
size_t size;
|
|
|
|
char* serialized =
|
|
|
|
upb_test_FakeMessageSet_serialize(fake, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized != nullptr);
|
|
|
|
ASSERT_GE(size, 0);
|
|
|
|
|
|
|
|
upb::DefPool defpool;
|
|
|
|
upb::MessageDefPtr m(upb_test_TestMessageSet_getmsgdef(defpool.ptr()));
|
|
|
|
EXPECT_TRUE(m.ptr() != nullptr);
|
|
|
|
upb_test_TestMessageSet* message_set = upb_test_TestMessageSet_parse_ex(
|
|
|
|
serialized, size, upb_DefPool_ExtensionRegistry(defpool.ptr()), 0,
|
|
|
|
arena.ptr());
|
|
|
|
ASSERT_TRUE(message_set != nullptr);
|
|
|
|
|
|
|
|
char* serialized2 =
|
|
|
|
upb_test_TestMessageSet_serialize(message_set, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized2 != nullptr);
|
|
|
|
ASSERT_GE(size, 0);
|
|
|
|
|
|
|
|
// Parse back into a fake MessageSet and verify that the unknown MessageSet
|
|
|
|
// item was preserved in full (both type_id and message).
|
|
|
|
upb_test_FakeMessageSet* fake2 =
|
|
|
|
upb_test_FakeMessageSet_parse(serialized2, size, arena.ptr());
|
|
|
|
ASSERT_TRUE(fake2 != nullptr);
|
|
|
|
|
|
|
|
const upb_test_FakeMessageSet_Item* const* items =
|
|
|
|
upb_test_FakeMessageSet_item(fake2, &size);
|
|
|
|
ASSERT_EQ(1, size);
|
|
|
|
EXPECT_EQ(12345, upb_test_FakeMessageSet_Item_type_id(items[0]));
|
|
|
|
EXPECT_TRUE(upb_StringView_IsEqual(
|
|
|
|
data_view, upb_test_FakeMessageSet_Item_message(items[0])));
|
|
|
|
|
|
|
|
// The non-MessageSet unknown fields should have been discarded.
|
|
|
|
EXPECT_FALSE(upb_test_FakeMessageSet_Item_has_unknown_varint(items[0]));
|
|
|
|
EXPECT_FALSE(upb_test_FakeMessageSet_Item_has_unknown_fixed32(items[0]));
|
|
|
|
EXPECT_FALSE(upb_test_FakeMessageSet_Item_has_unknown_fixed64(items[0]));
|
|
|
|
EXPECT_FALSE(upb_test_FakeMessageSet_Item_has_unknown_bytes(items[0]));
|
|
|
|
EXPECT_FALSE(upb_test_FakeMessageSet_Item_has_unknowngroup(items[0]));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(MessageTest, Proto2Enum) {
|
|
|
|
upb::Arena arena;
|
|
|
|
upb_test_Proto2FakeEnumMessage* fake_msg =
|
|
|
|
upb_test_Proto2FakeEnumMessage_new(arena.ptr());
|
|
|
|
|
|
|
|
upb_test_Proto2FakeEnumMessage_set_optional_enum(fake_msg, 999);
|
|
|
|
|
|
|
|
int32_t* vals = upb_test_Proto2FakeEnumMessage_resize_repeated_enum(
|
|
|
|
fake_msg, 6, arena.ptr());
|
|
|
|
vals[0] = upb_test_Proto2EnumMessage_ZERO;
|
|
|
|
vals[1] = 7; // Unknown small.
|
|
|
|
vals[2] = upb_test_Proto2EnumMessage_SMALL;
|
|
|
|
vals[3] = 888; // Unknown large.
|
|
|
|
vals[4] = upb_test_Proto2EnumMessage_LARGE;
|
|
|
|
vals[5] = upb_test_Proto2EnumMessage_NEGATIVE;
|
|
|
|
|
|
|
|
vals = upb_test_Proto2FakeEnumMessage_resize_packed_enum(fake_msg, 6,
|
|
|
|
arena.ptr());
|
|
|
|
vals[0] = upb_test_Proto2EnumMessage_ZERO;
|
|
|
|
vals[1] = 7; // Unknown small.
|
|
|
|
vals[2] = upb_test_Proto2EnumMessage_SMALL;
|
|
|
|
vals[3] = 888; // Unknown large.
|
|
|
|
vals[4] = upb_test_Proto2EnumMessage_LARGE;
|
|
|
|
vals[5] = upb_test_Proto2EnumMessage_NEGATIVE;
|
|
|
|
|
|
|
|
size_t size;
|
|
|
|
char* pb =
|
|
|
|
upb_test_Proto2FakeEnumMessage_serialize(fake_msg, arena.ptr(), &size);
|
|
|
|
|
|
|
|
// Parsing as enums puts unknown values into unknown fields.
|
|
|
|
upb_test_Proto2EnumMessage* enum_msg =
|
|
|
|
upb_test_Proto2EnumMessage_parse(pb, size, arena.ptr());
|
|
|
|
ASSERT_TRUE(enum_msg != nullptr);
|
|
|
|
|
|
|
|
EXPECT_EQ(false, upb_test_Proto2EnumMessage_has_optional_enum(enum_msg));
|
|
|
|
const int32_t* vals_const =
|
|
|
|
upb_test_Proto2EnumMessage_repeated_enum(enum_msg, &size);
|
|
|
|
EXPECT_EQ(4, size); // Two unknown values moved to the unknown field set.
|
|
|
|
|
|
|
|
// Parsing back into the fake message shows the original data, except the
|
|
|
|
// repeated enum is rearranged.
|
|
|
|
pb = upb_test_Proto2EnumMessage_serialize(enum_msg, arena.ptr(), &size);
|
|
|
|
upb_test_Proto2FakeEnumMessage* fake_msg2 =
|
|
|
|
upb_test_Proto2FakeEnumMessage_parse(pb, size, arena.ptr());
|
upb is self-hosting!
This CL changes the upb compiler to no longer depend on C++ protobuf libraries. upb now uses its own reflection libraries to implement its code generator.
# Key Benefits
1. upb can now use its own reflection libraries throughout the compiler. This makes upb more consistent and principled, and gives us more chances to dogfood our own C++ reflection API. This highlighted several parts of the C++ reflection API that were incomplete.
2. This CL removes code duplication that previously existed in the compiler. The upb reflection library has code to build MiniDescriptors and MiniTables out of descriptors, but prior to this CL the upb compiler could not use it. The upb compiler had a separate copy of this logic, and the compiler's copy of this logic was especially tricky and hard to maintain. This CL removes the separate copy of that logic.
3. This CL (mostly) removes upb's dependency on the C++ protobuf library. We still depend on `protoc` (the binary), but the runtime and compiler no longer link against C++'s libraries. This opens up the possibility of speeding up some builds significantly if we can use a prebuilt `protoc` binary.
# Bootstrap Stages
To bootstrap, we check in a copy of our generated code for `descriptor.proto` and `plugin.proto`. This allows the compiler to depend on the generated code for these two protos without creating a circular dependency. This code is checked in to the `stage0` directory.
The bootstrapping process is divided into a few stages. All `cc_library()`, `upb_proto_library()`, and `cc_binary()` targets that would otherwise be circular participate in this staging process. That currently includes:
* `//third_party/upb:descriptor_upb_proto`
* `//third_party/upb:plugin_upb_proto`
* `//third_party/upb:reflection`
* `//third_party/upb:reflection_internal`
* `//third_party/upbc:common`
* `//third_party/upbc:file_layout`
* `//third_party/upbc:plugin`
* `//third_party/upbc:protoc-gen-upb`
For each of these targets, we produce a rule for each stage (the logic for this is nicely encapsulated in Blaze/Bazel macros like `bootstrap_cc_library()` and `bootstrap_upb_proto_library()`, so the `BUILD` file remains readable). For example:
* `//third_party/upb:descriptor_upb_proto_stage0`
* `//third_party/upb:descriptor_upb_proto_stage1`
* `//third_party/upb:descriptor_upb_proto`
The stages are:
1. `stage0`: This uses the checked-in version of the generated code. The stage0 compiler is correct and outputs the same code as all other compilers, but it is unnecessarily slow because its protos were compiled in bootstrap mode. The stage0 compiler is used to generate protos for stage1.
2. `stage1`: The stage1 compiler is correct and fast, and therefore we use it in almost all cases (eg. `upb_proto_library()`). However its own protos were not generated using `upb_proto_library()`, so its `cc_library()` targets cannot be safely mixed with `upb_proto_library()`, as this would lead to duplicate symbols.
3. final (no stage): The final compiler is identical to the `stage1` compiler. The only difference is that its protos were built with `upb_proto_library()`. This doesn't matter very much for the compiler binary, but for the `cc_library()` targets like `//third_party/upb:reflection`, only the final targets can be safely linked in by other applications.
# "Bootstrap Mode" Protos
The checked-in generated code is generated in a special "bootstrap" mode that is a bit different than normal generated code. Bootstrap mode avoids depending on the internal representation of MiniTables or the messages, at the cost of slower runtime performance.
Bootstrap mode only interacts with MiniTables and messages using public APIs such as `upb_MiniTable_Build()`, `upb_Message_GetInt32()`, etc. This is very important as it allows us to change the internal representation without needing to regenerate our bootstrap protos. This will make it far easier to write CLs that change the internal representation, because it avoids the awkward dance of trying to regenerate the bootstrap protos when the compiler itself is broken due to bootstrap protos being out of date.
The bootstrap generated code does have two downsides:
1. The accessors are less efficient, because they look up MiniTable fields by number instead of hard-coding the MiniTableField into the generated code.
2. It requires runtime initialization of the MiniTables, which costs CPU cycles at startup, and also allocates memory which is never freed. Per google3 rules this is not really a leak, since this memory is still reachable via static variables, but it is undesirable in many contexts. We could fix this part by introducing the equivalent of `google::protobuf::ShutdownProtobufLibrary()`).
These downsides are fine for the bootstrapping process, but they are reason enough not to enable bootstrap mode in general for all protos.
# Bootstrapping Always Uses OSS Protos
To enable smooth syncing between Google3 and OSS, we always use an OSS version of the checked in generated code for `stage0`, even in google3.
This requires that the google3 code can be switched to reference the OSS proto names using a preprocessor define. We introduce the `UPB_DESC(xyz)` macro for this, which will expand into either `proto2_xyz` or `google_protobuf_xyz`. Any libraries used in `stage0` must use `UPB_DESC(xyz)` rather than refer to the symbol names directly.
PiperOrigin-RevId: 501458451
2 years ago
|
|
|
ASSERT_TRUE(fake_msg2 != nullptr);
|
|
|
|
|
|
|
|
EXPECT_EQ(true, upb_test_Proto2FakeEnumMessage_has_optional_enum(fake_msg2));
|
|
|
|
EXPECT_EQ(999, upb_test_Proto2FakeEnumMessage_optional_enum(fake_msg2));
|
|
|
|
|
|
|
|
int32_t expected[] = {
|
|
|
|
upb_test_Proto2EnumMessage_ZERO,
|
|
|
|
upb_test_Proto2EnumMessage_SMALL,
|
|
|
|
upb_test_Proto2EnumMessage_LARGE,
|
|
|
|
upb_test_Proto2EnumMessage_NEGATIVE,
|
|
|
|
7,
|
|
|
|
888,
|
|
|
|
};
|
|
|
|
|
|
|
|
vals_const = upb_test_Proto2FakeEnumMessage_repeated_enum(fake_msg2, &size);
|
|
|
|
EXPECT_EQ(6, size);
|
|
|
|
EXPECT_THAT(std::vector<int32_t>(vals_const, vals_const + size),
|
|
|
|
::testing::ElementsAreArray(expected));
|
|
|
|
|
|
|
|
vals_const = upb_test_Proto2FakeEnumMessage_packed_enum(fake_msg2, &size);
|
|
|
|
EXPECT_EQ(6, size);
|
|
|
|
EXPECT_THAT(std::vector<int32_t>(vals_const, vals_const + size),
|
|
|
|
::testing::ElementsAreArray(expected));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(MessageTest, TestBadUTF8) {
|
|
|
|
upb::Arena arena;
|
|
|
|
std::string serialized("r\x03\xed\xa0\x81");
|
|
|
|
EXPECT_EQ(nullptr, protobuf_test_messages_proto3_TestAllTypesProto3_parse(
|
|
|
|
serialized.data(), serialized.size(), arena.ptr()));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(MessageTest, DecodeRequiredFieldsTopLevelMessage) {
|
|
|
|
upb::Arena arena;
|
|
|
|
upb_test_TestRequiredFields* test_msg;
|
|
|
|
upb_test_EmptyMessage* empty_msg;
|
|
|
|
|
|
|
|
// Succeeds, because we did not request required field checks.
|
|
|
|
test_msg = upb_test_TestRequiredFields_parse(nullptr, 0, arena.ptr());
|
|
|
|
EXPECT_NE(nullptr, test_msg);
|
|
|
|
|
|
|
|
// Fails, because required fields are missing.
|
|
|
|
EXPECT_EQ(kUpb_DecodeStatus_MissingRequired,
|
|
|
|
upb_Decode(nullptr, 0, UPB_UPCAST(test_msg),
|
|
|
|
&upb_0test__TestRequiredFields_msg_init, nullptr,
|
|
|
|
kUpb_DecodeOption_CheckRequired, arena.ptr()));
|
|
|
|
|
|
|
|
upb_test_TestRequiredFields_set_required_int32(test_msg, 1);
|
|
|
|
size_t size;
|
|
|
|
char* serialized =
|
|
|
|
upb_test_TestRequiredFields_serialize(test_msg, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized != nullptr);
|
|
|
|
EXPECT_NE(0, size);
|
|
|
|
|
|
|
|
// Fails, but the code path is slightly different because the serialized
|
|
|
|
// payload is not empty.
|
|
|
|
EXPECT_EQ(kUpb_DecodeStatus_MissingRequired,
|
|
|
|
upb_Decode(serialized, size, UPB_UPCAST(test_msg),
|
|
|
|
&upb_0test__TestRequiredFields_msg_init, nullptr,
|
|
|
|
kUpb_DecodeOption_CheckRequired, arena.ptr()));
|
|
|
|
|
|
|
|
empty_msg = upb_test_EmptyMessage_new(arena.ptr());
|
|
|
|
upb_test_TestRequiredFields_set_required_int32(test_msg, 1);
|
|
|
|
upb_test_TestRequiredFields_set_required_int64(test_msg, 2);
|
|
|
|
upb_test_TestRequiredFields_set_required_message(test_msg, empty_msg);
|
|
|
|
|
|
|
|
// Succeeds, because required fields are present (though not in the input).
|
|
|
|
EXPECT_EQ(kUpb_DecodeStatus_Ok,
|
|
|
|
upb_Decode(nullptr, 0, UPB_UPCAST(test_msg),
|
|
|
|
&upb_0test__TestRequiredFields_msg_init, nullptr,
|
|
|
|
kUpb_DecodeOption_CheckRequired, arena.ptr()));
|
|
|
|
|
|
|
|
// Serialize a complete payload.
|
|
|
|
serialized =
|
|
|
|
upb_test_TestRequiredFields_serialize(test_msg, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized != nullptr);
|
|
|
|
EXPECT_NE(0, size);
|
|
|
|
|
|
|
|
upb_test_TestRequiredFields* test_msg2 = upb_test_TestRequiredFields_parse_ex(
|
|
|
|
serialized, size, nullptr, kUpb_DecodeOption_CheckRequired, arena.ptr());
|
|
|
|
EXPECT_NE(nullptr, test_msg2);
|
|
|
|
|
|
|
|
// When we add an incomplete sub-message, this is not flagged by the parser.
|
|
|
|
// This makes parser checking unsuitable for MergeFrom().
|
|
|
|
upb_test_TestRequiredFields_set_optional_message(
|
|
|
|
test_msg2, upb_test_TestRequiredFields_new(arena.ptr()));
|
|
|
|
EXPECT_EQ(kUpb_DecodeStatus_Ok,
|
|
|
|
upb_Decode(serialized, size, UPB_UPCAST(test_msg2),
|
|
|
|
&upb_0test__TestRequiredFields_msg_init, nullptr,
|
|
|
|
kUpb_DecodeOption_CheckRequired, arena.ptr()));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(MessageTest, DecodeRequiredFieldsSubMessage) {
|
|
|
|
upb::Arena arena;
|
|
|
|
upb_test_TestRequiredFields* test_msg =
|
|
|
|
upb_test_TestRequiredFields_new(arena.ptr());
|
|
|
|
upb_test_SubMessageHasRequired* sub_msg =
|
|
|
|
upb_test_SubMessageHasRequired_new(arena.ptr());
|
|
|
|
upb_test_EmptyMessage* empty_msg = upb_test_EmptyMessage_new(arena.ptr());
|
|
|
|
|
|
|
|
upb_test_SubMessageHasRequired_set_optional_message(sub_msg, test_msg);
|
|
|
|
size_t size;
|
|
|
|
char* serialized =
|
|
|
|
upb_test_SubMessageHasRequired_serialize(sub_msg, arena.ptr(), &size);
|
|
|
|
EXPECT_NE(0, size);
|
|
|
|
|
|
|
|
// No parse error when parsing normally.
|
|
|
|
EXPECT_NE(nullptr, upb_test_SubMessageHasRequired_parse(serialized, size,
|
|
|
|
arena.ptr()));
|
|
|
|
|
|
|
|
// Parse error when verifying required fields, due to incomplete sub-message.
|
|
|
|
EXPECT_EQ(nullptr, upb_test_SubMessageHasRequired_parse_ex(
|
|
|
|
serialized, size, nullptr,
|
|
|
|
kUpb_DecodeOption_CheckRequired, arena.ptr()));
|
|
|
|
|
|
|
|
upb_test_TestRequiredFields_set_required_int32(test_msg, 1);
|
|
|
|
upb_test_TestRequiredFields_set_required_int64(test_msg, 2);
|
|
|
|
upb_test_TestRequiredFields_set_required_message(test_msg, empty_msg);
|
|
|
|
|
|
|
|
serialized =
|
|
|
|
upb_test_SubMessageHasRequired_serialize(sub_msg, arena.ptr(), &size);
|
|
|
|
EXPECT_NE(0, size);
|
|
|
|
|
|
|
|
// No parse error; sub-message now is complete.
|
|
|
|
EXPECT_NE(nullptr, upb_test_SubMessageHasRequired_parse_ex(
|
|
|
|
serialized, size, nullptr,
|
|
|
|
kUpb_DecodeOption_CheckRequired, arena.ptr()));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(MessageTest, EncodeRequiredFields) {
|
|
|
|
upb::Arena arena;
|
|
|
|
upb_test_TestRequiredFields* test_msg =
|
|
|
|
upb_test_TestRequiredFields_new(arena.ptr());
|
|
|
|
|
|
|
|
// Succeeds, we didn't ask for required field checking.
|
|
|
|
size_t size;
|
|
|
|
char* serialized =
|
|
|
|
upb_test_TestRequiredFields_serialize_ex(test_msg, 0, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized != nullptr);
|
|
|
|
EXPECT_EQ(size, 0);
|
|
|
|
|
|
|
|
// Fails, we asked for required field checking but the required field is
|
|
|
|
// missing.
|
|
|
|
serialized = upb_test_TestRequiredFields_serialize_ex(
|
|
|
|
test_msg, kUpb_EncodeOption_CheckRequired, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized == nullptr);
|
|
|
|
|
|
|
|
// Fails, some required fields are present but not others.
|
|
|
|
upb_test_TestRequiredFields_set_required_int32(test_msg, 1);
|
|
|
|
serialized = upb_test_TestRequiredFields_serialize_ex(
|
|
|
|
test_msg, kUpb_EncodeOption_CheckRequired, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized == nullptr);
|
|
|
|
|
|
|
|
// Succeeds, all required fields are set.
|
|
|
|
upb_test_EmptyMessage* empty_msg = upb_test_EmptyMessage_new(arena.ptr());
|
|
|
|
upb_test_TestRequiredFields_set_required_int64(test_msg, 2);
|
|
|
|
upb_test_TestRequiredFields_set_required_message(test_msg, empty_msg);
|
|
|
|
serialized = upb_test_TestRequiredFields_serialize_ex(
|
|
|
|
test_msg, kUpb_EncodeOption_CheckRequired, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized != nullptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(MessageTest, MaxRequiredFields) {
|
|
|
|
upb::Arena arena;
|
|
|
|
upb_test_TestMaxRequiredFields* test_msg =
|
|
|
|
upb_test_TestMaxRequiredFields_new(arena.ptr());
|
|
|
|
|
|
|
|
// Fails, we asked for required field checking but the required field is
|
|
|
|
// missing.
|
|
|
|
size_t size;
|
|
|
|
char* serialized = upb_test_TestMaxRequiredFields_serialize_ex(
|
|
|
|
test_msg, kUpb_EncodeOption_CheckRequired, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized == nullptr);
|
|
|
|
|
|
|
|
upb::DefPool defpool;
|
|
|
|
upb::MessageDefPtr m(upb_test_TestMaxRequiredFields_getmsgdef(defpool.ptr()));
|
|
|
|
upb_MessageValue val;
|
|
|
|
val.int32_val = 1;
|
|
|
|
for (int i = 1; i <= 61; i++) {
|
|
|
|
upb::FieldDefPtr f = m.FindFieldByNumber(i);
|
|
|
|
ASSERT_TRUE(f);
|
|
|
|
upb_Message_SetFieldByDef(UPB_UPCAST(test_msg), f.ptr(), val, arena.ptr());
|
|
|
|
}
|
|
|
|
|
|
|
|
// Fails, field 63 still isn't set.
|
|
|
|
serialized = upb_test_TestMaxRequiredFields_serialize_ex(
|
|
|
|
test_msg, kUpb_EncodeOption_CheckRequired, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized == nullptr);
|
|
|
|
|
|
|
|
// Succeeds, all required fields are set.
|
|
|
|
upb::FieldDefPtr f = m.FindFieldByNumber(62);
|
|
|
|
ASSERT_TRUE(f);
|
|
|
|
upb_Message_SetFieldByDef(UPB_UPCAST(test_msg), f.ptr(), val, arena.ptr());
|
|
|
|
serialized = upb_test_TestMaxRequiredFields_serialize_ex(
|
|
|
|
test_msg, kUpb_EncodeOption_CheckRequired, arena.ptr(), &size);
|
|
|
|
ASSERT_TRUE(serialized != nullptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(MessageTest, MapField) {
|
|
|
|
upb::Arena arena;
|
|
|
|
upb_test_TestMapFieldExtra* test_msg_extra =
|
|
|
|
upb_test_TestMapFieldExtra_new(arena.ptr());
|
|
|
|
|
|
|
|
ASSERT_TRUE(upb_test_TestMapFieldExtra_map_field_set(
|
|
|
|
test_msg_extra, 0, upb_test_TestMapFieldExtra_THREE, arena.ptr()));
|
|
|
|
|
|
|
|
size_t size;
|
|
|
|
char* serialized = upb_test_TestMapFieldExtra_serialize_ex(
|
|
|
|
test_msg_extra, 0, arena.ptr(), &size);
|
|
|
|
ASSERT_NE(nullptr, serialized);
|
|
|
|
ASSERT_NE(0, size);
|
|
|
|
|
|
|
|
upb_test_TestMapField* test_msg =
|
|
|
|
upb_test_TestMapField_parse(serialized, size, arena.ptr());
|
|
|
|
ASSERT_NE(nullptr, test_msg);
|
|
|
|
|
|
|
|
ASSERT_FALSE(upb_test_TestMapField_map_field_get(test_msg, 0, nullptr));
|
|
|
|
serialized =
|
|
|
|
upb_test_TestMapField_serialize_ex(test_msg, 0, arena.ptr(), &size);
|
|
|
|
ASSERT_NE(0, size);
|
|
|
|
// parse into second instance
|
|
|
|
upb_test_TestMapFieldExtra* test_msg_extra2 =
|
|
|
|
upb_test_TestMapFieldExtra_parse(serialized, size, arena.ptr());
|
|
|
|
ASSERT_TRUE(
|
|
|
|
upb_test_TestMapFieldExtra_map_field_get(test_msg_extra2, 0, nullptr));
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(MessageTest, Freeze) {
|
|
|
|
const upb_MiniTable* m = &upb_0test__TestFreeze_msg_init;
|
|
|
|
upb::Arena arena;
|
|
|
|
|
|
|
|
{
|
|
|
|
upb_test_TestFreeze* raw = upb_test_TestFreeze_new(arena.ptr());
|
|
|
|
upb_Message* msg = UPB_UPCAST(raw);
|
|
|
|
ASSERT_FALSE(upb_Message_IsFrozen(msg));
|
|
|
|
upb_Message_Freeze(msg, m);
|
|
|
|
ASSERT_TRUE(upb_Message_IsFrozen(msg));
|
|
|
|
}
|
|
|
|
{
|
|
|
|
upb_test_TestFreeze* raw = upb_test_TestFreeze_new(arena.ptr());
|
|
|
|
upb_Message* msg = UPB_UPCAST(raw);
|
|
|
|
size_t size;
|
|
|
|
upb_Array* arr = _upb_test_TestFreeze_array_int_mutable_upb_array(
|
|
|
|
raw, &size, arena.ptr());
|
|
|
|
ASSERT_NE(arr, nullptr);
|
|
|
|
ASSERT_EQ(size, 0);
|
|
|
|
ASSERT_FALSE(upb_Array_IsFrozen(arr));
|
|
|
|
upb_Map* map =
|
|
|
|
_upb_test_TestFreeze_map_int_mutable_upb_map(raw, arena.ptr());
|
|
|
|
ASSERT_NE(map, nullptr);
|
|
|
|
ASSERT_FALSE(upb_Map_IsFrozen(map));
|
|
|
|
upb_test_TestFreeze* nest = upb_test_TestFreeze_new(arena.ptr());
|
|
|
|
upb_test_set_nest(raw, nest, arena.ptr());
|
|
|
|
ASSERT_FALSE(upb_Message_IsFrozen(UPB_UPCAST(nest)));
|
|
|
|
|
|
|
|
upb_Message_Freeze(msg, m);
|
|
|
|
ASSERT_TRUE(upb_Message_IsFrozen(msg));
|
|
|
|
ASSERT_TRUE(upb_Array_IsFrozen(arr));
|
|
|
|
ASSERT_TRUE(upb_Map_IsFrozen(map));
|
|
|
|
ASSERT_TRUE(upb_Message_IsFrozen(UPB_UPCAST(nest)));
|
|
|
|
}
|
|
|
|
{
|
|
|
|
upb_test_TestFreeze* raw = upb_test_TestFreeze_new(arena.ptr());
|
|
|
|
upb_Message* msg = UPB_UPCAST(raw);
|
|
|
|
size_t size;
|
|
|
|
upb_Array* arr = _upb_test_TestFreeze_array_int_mutable_upb_array(
|
|
|
|
raw, &size, arena.ptr());
|
|
|
|
ASSERT_NE(arr, nullptr);
|
|
|
|
ASSERT_EQ(size, 0);
|
|
|
|
ASSERT_FALSE(upb_Array_IsFrozen(arr));
|
|
|
|
upb_Map* map =
|
|
|
|
_upb_test_TestFreeze_map_int_mutable_upb_map(raw, arena.ptr());
|
|
|
|
ASSERT_NE(map, nullptr);
|
|
|
|
ASSERT_FALSE(upb_Map_IsFrozen(map));
|
|
|
|
upb_test_TestFreeze* nest = upb_test_TestFreeze_new(arena.ptr());
|
|
|
|
upb_test_set_nest(raw, nest, arena.ptr());
|
|
|
|
ASSERT_FALSE(upb_Message_IsFrozen(UPB_UPCAST(nest)));
|
|
|
|
|
|
|
|
upb_Message_Freeze(UPB_UPCAST(nest), m);
|
|
|
|
ASSERT_FALSE(upb_Message_IsFrozen(msg));
|
|
|
|
ASSERT_FALSE(upb_Array_IsFrozen(arr));
|
|
|
|
ASSERT_FALSE(upb_Map_IsFrozen(map));
|
|
|
|
ASSERT_TRUE(upb_Message_IsFrozen(UPB_UPCAST(nest)));
|
|
|
|
|
|
|
|
const upb_MiniTableField* fa = upb_MiniTable_FindFieldByNumber(m, 20);
|
|
|
|
const upb_MiniTable* ma = upb_MiniTable_SubMessage(m, fa);
|
|
|
|
upb_Array_Freeze(arr, ma);
|
|
|
|
ASSERT_FALSE(upb_Message_IsFrozen(msg));
|
|
|
|
ASSERT_TRUE(upb_Array_IsFrozen(arr));
|
|
|
|
ASSERT_FALSE(upb_Map_IsFrozen(map));
|
|
|
|
ASSERT_TRUE(upb_Message_IsFrozen(UPB_UPCAST(nest)));
|
|
|
|
|
|
|
|
const upb_MiniTableField* fm = upb_MiniTable_FindFieldByNumber(m, 10);
|
|
|
|
const upb_MiniTable* mm = upb_MiniTable_SubMessage(m, fm);
|
|
|
|
upb_Map_Freeze(map, mm);
|
|
|
|
ASSERT_FALSE(upb_Message_IsFrozen(msg));
|
|
|
|
ASSERT_TRUE(upb_Array_IsFrozen(arr));
|
|
|
|
ASSERT_TRUE(upb_Map_IsFrozen(map));
|
|
|
|
ASSERT_TRUE(upb_Message_IsFrozen(UPB_UPCAST(nest)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// begin:google_only
|
|
|
|
//
|
|
|
|
// static void DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// const upb::fuzz::MiniTableFuzzInput& input, std::string_view proto_payload,
|
|
|
|
// int decode_options, int encode_options) {
|
|
|
|
// // Lexan does not have setenv
|
|
|
|
// #ifndef _MSC_VER
|
|
|
|
// setenv("FUZZTEST_STACK_LIMIT", "262144", 1);
|
|
|
|
// #endif
|
|
|
|
// // The value of 80 used here is empirical and intended to roughly represent
|
|
|
|
// // the tiny 64K stack size used by the test framework. We still see the
|
|
|
|
// // occasional stack overflow at 90, so far 80 has worked 100% of the time.
|
|
|
|
// decode_options = upb_Decode_LimitDepth(decode_options, 80);
|
|
|
|
// encode_options = upb_Encode_LimitDepth(encode_options, 80);
|
|
|
|
//
|
|
|
|
// upb::Arena arena;
|
|
|
|
// upb_ExtensionRegistry* exts;
|
|
|
|
// const upb_MiniTable* mini_table =
|
|
|
|
// upb::fuzz::BuildMiniTable(input, &exts, arena.ptr());
|
|
|
|
// if (!mini_table) return;
|
|
|
|
// upb_Message* msg = upb_Message_New(mini_table, arena.ptr());
|
|
|
|
// upb_Decode(proto_payload.data(), proto_payload.size(), msg, mini_table, exts,
|
|
|
|
// decode_options, arena.ptr());
|
|
|
|
// char* ptr;
|
|
|
|
// size_t size;
|
|
|
|
// upb_Encode(msg, mini_table, encode_options, arena.ptr(), &ptr, &size);
|
|
|
|
// }
|
|
|
|
// FUZZ_TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayload);
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, DecodeUnknownProto2EnumExtension) {
|
Fixed bug when parsing an unknown value in a proto2 enum extension. #fuzzing
Proto2 enum parsing is the only case where we have to look at the wire value (not merely the tag) to decide whether the field is known or unknown. If the value is unknown, we need to put the value in the Unknown Fields, but for an extension we no longer have easy access to the message, because for extensions we replace the `msg` pointer with a pointer to the extension. The bug occurred when we were treating the fake `upb_Message*` (which was actually a pointer to an extension) as a real `upb_Message*` that can have unknown fields.
This CL fixes the problem by preserving the true message pointer in `d->unknown_msg` when we are parsing an extension.
This also required fixing a bug in MiniTable building when fasttables are enabled. We need to set the table_mask to `-1` to disable fasttable parsing, not `0`.
For unknown reasons, this CL appears to speed up parsing somewhat significantly. Ideally we should be tracking parsing performance better over time, as it is possible this is merely regaining performance that was lost at a different time:
```
benchy --reference=srcfs third_party/upb/benchmarks:benchmark
10 / 10 [=================================================================================================================] 100.00% 2m32s
(Generated by http://go/benchy. Settings: --runs 5 --reference "srcfs")
name old cpu/op new cpu/op delta
BM_ArenaOneAlloc 23.9ns ± 6% 23.7ns ± 4% ~ (p=0.180 n=53+51)
BM_ArenaInitialBlockOneAlloc 7.62ns ± 4% 7.70ns ± 5% +0.99% (p=0.024 n=59+60)
BM_LoadAdsDescriptor_Upb<NoLayout> 6.60ms ±10% 6.57ms ± 8% ~ (p=0.607 n=47+54)
BM_LoadAdsDescriptor_Upb<WithLayout> 6.92ms ± 5% 6.88ms ± 8% ~ (p=0.257 n=54+54)
BM_LoadAdsDescriptor_Proto2<NoLayout> 14.2ms ± 8% 14.0ms ± 7% -1.38% (p=0.025 n=58+59)
BM_LoadAdsDescriptor_Proto2<WithLayout> 14.3ms ± 8% 14.2ms ± 8% -1.16% (p=0.031 n=58+57)
BM_Parse_Upb_FileDesc<UseArena, Copy> 15.9µs ± 4% 14.6µs ± 4% -7.85% (p=0.000 n=57+59)
BM_Parse_Upb_FileDesc<UseArena, Alias> 14.5µs ± 4% 13.3µs ± 5% -8.50% (p=0.000 n=57+60)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 15.7µs ± 4% 14.4µs ± 5% -7.99% (p=0.000 n=59+60)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 14.2µs ± 5% 13.0µs ± 4% -8.56% (p=0.000 n=57+58)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 26.3µs ± 4% 26.2µs ± 4% ~ (p=0.195 n=55+53)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 13.3µs ± 5% 13.2µs ± 4% ~ (p=0.085 n=59+59)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 12.9µs ± 4% 12.8µs ± 3% -0.66% (p=0.023 n=60+58)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 10.9µs ± 6% 10.9µs ± 4% ~ (p=0.063 n=59+58)
BM_SerializeDescriptor_Proto2 7.57µs ± 6% 7.62µs ± 6% ~ (p=0.147 n=57+58)
BM_SerializeDescriptor_Upb 12.8µs ± 4% 12.8µs ± 4% ~ (p=0.163 n=59+56)
name old time/op new time/op delta
BM_ArenaOneAlloc 23.9ns ± 5% 23.7ns ± 4% ~ (p=0.172 n=53+51)
BM_ArenaInitialBlockOneAlloc 7.62ns ± 4% 7.70ns ± 5% +1.02% (p=0.017 n=59+60)
BM_LoadAdsDescriptor_Upb<NoLayout> 6.60ms ±10% 6.58ms ± 8% ~ (p=0.727 n=47+55)
BM_LoadAdsDescriptor_Upb<WithLayout> 6.92ms ± 5% 6.88ms ± 8% ~ (p=0.260 n=54+54)
BM_LoadAdsDescriptor_Proto2<NoLayout> 14.2ms ± 7% 14.0ms ± 7% -1.40% (p=0.019 n=58+59)
BM_LoadAdsDescriptor_Proto2<WithLayout> 14.3ms ± 8% 14.2ms ± 8% -1.13% (p=0.037 n=58+57)
BM_Parse_Upb_FileDesc<UseArena, Copy> 15.9µs ± 4% 14.6µs ± 3% -7.88% (p=0.000 n=57+59)
BM_Parse_Upb_FileDesc<UseArena, Alias> 14.5µs ± 4% 13.3µs ± 5% -8.46% (p=0.000 n=57+60)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 15.7µs ± 4% 14.4µs ± 5% -7.99% (p=0.000 n=59+60)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 14.2µs ± 5% 13.0µs ± 4% -8.56% (p=0.000 n=57+58)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 26.3µs ± 4% 26.2µs ± 4% ~ (p=0.224 n=55+53)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 13.3µs ± 5% 13.2µs ± 4% ~ (p=0.098 n=59+59)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 12.9µs ± 4% 12.8µs ± 3% -0.68% (p=0.015 n=60+58)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 10.9µs ± 6% 10.9µs ± 4% ~ (p=0.052 n=59+58)
BM_SerializeDescriptor_Proto2 7.56µs ± 6% 7.62µs ± 6% ~ (p=0.111 n=58+58)
BM_SerializeDescriptor_Upb 12.8µs ± 4% 12.8µs ± 4% ~ (p=0.241 n=56+56)
name old allocs/op new allocs/op delta
BM_ArenaOneAlloc 1.00 ± 0% 1.00 ± 0% ~ (all samples are equal)
BM_ArenaInitialBlockOneAlloc 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
BM_LoadAdsDescriptor_Upb<NoLayout> 5.98k ± 0% 5.98k ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Upb<WithLayout> 5.98k ± 0% 5.98k ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Proto2<NoLayout> 80.9k ± 0% 80.9k ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Proto2<WithLayout> 82.1k ± 0% 82.1k ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<UseArena, Copy> 7.00 ± 0% 7.00 ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<UseArena, Alias> 7.00 ± 0% 7.00 ± 0% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 765 ± 0% 765 ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 9.00 ± 0% 9.00 ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
BM_SerializeDescriptor_Proto2 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
BM_SerializeDescriptor_Upb 0.00 ±NaN% 0.00 ±NaN% ~ (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 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
BM_LoadAdsDescriptor_Upb<NoLayout> 9.60M ± 0% 9.60M ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Upb<WithLayout> 9.68M ± 0% 9.68M ± 0% ~ (all samples are equal)
BM_LoadAdsDescriptor_Proto2<NoLayout> 6.41M ± 0% 6.41M ± 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> 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 0.00 ±NaN% 0.00 ±NaN% ~ (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.7k ± 0% 40.7k ± 0% ~ (all samples are equal)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
BM_SerializeDescriptor_Proto2 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
BM_SerializeDescriptor_Upb 0.00 ±NaN% 0.00 ±NaN% ~ (all samples are equal)
name old speed new speed delta
BM_LoadAdsDescriptor_Upb<NoLayout> 113MB/s ± 9% 113MB/s ± 8% ~ (p=0.712 n=47+55)
BM_LoadAdsDescriptor_Upb<WithLayout> 107MB/s ± 8% 108MB/s ± 8% ~ (p=0.200 n=55+54)
BM_LoadAdsDescriptor_Proto2<NoLayout> 52.5MB/s ± 8% 53.3MB/s ± 7% +1.51% (p=0.018 n=59+59)
BM_LoadAdsDescriptor_Proto2<WithLayout> 51.9MB/s ± 7% 52.4MB/s ± 8% +1.01% (p=0.050 n=58+58)
BM_Parse_Upb_FileDesc<UseArena, Copy> 473MB/s ± 4% 514MB/s ± 4% +8.52% (p=0.000 n=57+59)
BM_Parse_Upb_FileDesc<UseArena, Alias> 518MB/s ± 4% 566MB/s ± 5% +9.30% (p=0.000 n=57+60)
BM_Parse_Upb_FileDesc<InitBlock, Copy> 480MB/s ± 4% 521MB/s ± 5% +8.69% (p=0.000 n=59+60)
BM_Parse_Upb_FileDesc<InitBlock, Alias> 528MB/s ± 4% 578MB/s ± 4% +9.36% (p=0.000 n=57+58)
BM_Parse_Proto2<FileDesc, NoArena, Copy> 286MB/s ± 4% 287MB/s ± 4% ~ (p=0.195 n=55+53)
BM_Parse_Proto2<FileDesc, UseArena, Copy> 566MB/s ± 5% 570MB/s ± 4% ~ (p=0.085 n=59+59)
BM_Parse_Proto2<FileDesc, InitBlock, Copy> 583MB/s ± 5% 587MB/s ± 3% +0.64% (p=0.023 n=60+58)
BM_Parse_Proto2<FileDescSV, InitBlock, Alias> 688MB/s ± 6% 693MB/s ± 4% ~ (p=0.063 n=59+58)
BM_SerializeDescriptor_Proto2 995MB/s ± 6% 988MB/s ± 5% ~ (p=0.147 n=57+58)
BM_SerializeDescriptor_Upb 586MB/s ± 4% 589MB/s ± 4% ~ (p=0.163 n=59+56)
```
PiperOrigin-RevId: 462022073
2 years ago
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {{"\256\354Rt\216\3271\234", "\243\243\267\207\336gV\366w"},
|
|
|
|
// {"z"},
|
|
|
|
// "}\212\304d\371\363\341\2329\325B\264\377?\215\223\201\201\226y\201%"
|
|
|
|
// "\321\363\255;",
|
|
|
|
// {}},
|
|
|
|
// "\010", -724543908, -591643538);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, DecodeExtensionEnsurePresenceInitialized) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {{"\031", "S", "\364", "", "", "j", "\303", "", "\224", "\277"},
|
|
|
|
// {},
|
|
|
|
// "_C-\236$*)C0C>",
|
|
|
|
// {4041515984, 2147483647, 1929379871, 0, 3715937258, 4294967295}},
|
|
|
|
// "\010\002", 342248070, -806315555);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, DecodeExtendMessageSetWithNonMessage) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {{"\n"}, {""}, ".\244", {}}, "\013\032\005\212a#\365\336\020\001\226",
|
|
|
|
// 14803219, 670718349);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, DecodeExtendMessageSetWithNonMessage2) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload({{"\n", "G", "\n", "\274", ""},
|
|
|
|
// {"", "\030"},
|
|
|
|
// "_@",
|
|
|
|
// {4294967295, 2147483647}},
|
|
|
|
// std::string("\013\032\000\220", 4),
|
|
|
|
// 279975758, 1647495141);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, DecodeExtendMessageSetWithNonMessage3) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {{"\n"}, {"B", ""}, "\212:b", {11141121}},
|
|
|
|
// "\013\032\004\357;7\363\020\001\346\240\200\201\271", 399842149,
|
|
|
|
// -452966025);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, DecodeExtendMessageSetWithNonMessage4) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {{"\n", "3\340", "\354"}, {}, "B}G", {4294967295, 4082331310}},
|
|
|
|
// "\013\032\004\244B\331\255\020\001\220\224\243\350\t", -561523015,
|
|
|
|
// 1683327312);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, DecodeExtendMessageSetWithNonMessage5) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {{"\n"}, {""}, "kB", {0}},
|
|
|
|
// "x\203\251\006\013\032\002S\376\010\273\'\020\014\365\207\244\234",
|
|
|
|
// -696925610, -654590577);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, ExtendMessageSetWithEmptyExtension) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload({{"\n"}, {}, "_", {}}, std::string(), 0,
|
|
|
|
// 0);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayloadRegression) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {{"\320", "\320", "\320", "\320", "\320", "%2%%%%%"},
|
|
|
|
// {"", "", "", "", "", "", "", "", "", "", "", "",
|
|
|
|
// "", "", "", "", "", "", "", "", "", "", ""},
|
|
|
|
// "\226\226\226\226\226\226\350\351\350\350\350\350\350\350\350\314",
|
|
|
|
// {4026531839}},
|
|
|
|
// std::string("\n\n\n\n\272\n======@@%%%%%%%%%%%%%%%@@@(("
|
|
|
|
// "qqqqqqqq5555555555qqqqqffq((((((((((((\335@@>"
|
|
|
|
// "\ru\360ncppppxxxxxxxxx\025\025\025xxxxxppppppp<="
|
|
|
|
// "\2165\275\275\315\217\361\010\t\000\016\013in\n\n\n\256\263",
|
|
|
|
// 130),
|
|
|
|
// 901979906, 65537);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// // This test encodes a map field with extra cruft.
|
|
|
|
// TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayloadRegressionInvalidMap) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload({{"%%%%///////"}, {}, "", {}},
|
|
|
|
// std::string("\035|", 2), 65536, 3);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// // This test found a case where presence was unset for a mini table field.
|
|
|
|
// TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayloadRegressionMsan) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload({{"%-#^#"}, {}, "", {}}, std::string(),
|
|
|
|
// -1960166338, 16809991);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// // This test encodes a map containing a msg wrapping another, empty msg.
|
|
|
|
// TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayloadRegressionMapMap) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {{"%#G"}, {}, "", {}}, std::string("\022\002\022\000", 4), 0, 0);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, GroupMap) {
|
|
|
|
// // Groups should not be allowed as maps, but we previously failed to prevent
|
|
|
|
// // this.
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {.mini_descriptors = {"$$FF$", "%-C"},
|
|
|
|
// .enum_mini_descriptors = {},
|
|
|
|
// .extensions = "",
|
|
|
|
// .links = {1}},
|
|
|
|
// std::string(
|
|
|
|
// "\023\020\030\233\000\204\330\372#\000`"
|
|
|
|
// "a\000\000\001\000\000\000ccccccc\030s\273sssssssss\030\030\030\030"
|
|
|
|
// "\030\030\030\030\215\215\215\215\215\215\215\215\030\030\232\253\253"
|
|
|
|
// "\232*\334\227\273\231\207\373\t\0051\305\265\335\224\226"),
|
|
|
|
// 0, 0);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, MapUnknownFieldSpanBuffers) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {{"$ 3", "%# "}, {}, "", {1}},
|
|
|
|
// std::string(
|
|
|
|
// "\"\002\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000",
|
|
|
|
// 17),
|
|
|
|
// 0, 0);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// // Another test for mismatched submsg types.
|
|
|
|
// TEST(FuzzTest, DecodeEncodeArbitrarySchemaAndPayloadRegression22) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {{"$2222222222222222222222", "%,&"}, {}, "", {1}},
|
|
|
|
// std::string("\035\170\170\170\051\263\001\030\000\035\357\357\340\021\035"
|
|
|
|
// "\025\331\035\035\035\035\035\035\035\035",
|
|
|
|
// 25),
|
|
|
|
// 0, 0);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, ExtensionWithoutExt) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload({{"$ 3", "", "%#F"}, {}, "", {2, 1}},
|
|
|
|
// std::string("\022\002\010\000", 4), 0,
|
|
|
|
// 0);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, MapFieldVerify) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload({{"% ^!"}, {}, "", {}}, "", 0, 0);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// TEST(FuzzTest, TooManyRequiredFields) {
|
|
|
|
// DecodeEncodeArbitrarySchemaAndPayload(
|
|
|
|
// {{"$ N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N "
|
|
|
|
// "N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N N"},
|
|
|
|
// {},
|
|
|
|
// "",
|
|
|
|
// {}},
|
|
|
|
// "", 0, 4);
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// end:google_only
|