Chiebot-Mirror
/
protobuf
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Obliterate protos namespace from hpb.h!

Browse Source 
PiperOrigin-RevId: 658477450
pull/17616/head
Hong Shin 10 months ago committed by Copybara-Service
parent f87523dd41
commit c75e50febb
5 changed files with 31 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      hpb/extension_lock_test.cc
  2. 25
      hpb/hpb.h
  3. 10
      hpb_generator/gen_messages.cc
  4. 18
      hpb_generator/tests/test_generated.cc
  5. 8
      protos/protos.h

4
hpb/extension_lock_test.cc
Unescape View File

@ -42,7 +42,7 @@ std::string GenerateTestData() {
ABSL_CHECK_OK(
::hpb::SetExtension(&model, ThemeExtension::theme_extension, extension2));
::upb::Arena arena;
auto bytes = ::protos::Serialize(&model, arena);
auto bytes = ::hpb::Serialize(&model, arena);
ABSL_CHECK_OK(bytes);
return std::string(bytes->data(), bytes->size());
}
@ -75,7 +75,7 @@ void TestConcurrentExtensionAccess(::hpb::ExtensionRegistry registry) {
};
const auto test_serialize = [&] {
::upb::Arena arena;
EXPECT_OK(::protos::Serialize(&parsed_model, arena));
EXPECT_OK(::hpb::Serialize(&parsed_model, arena));
};
const auto test_copy_constructor = [&] {
TestModel copy_a = parsed_model;

25
hpb/hpb.h
Unescape View File

@ -438,6 +438,12 @@ absl::StatusOr<Ptr<const Extension>> GetExtension(
return GetExtension(Ptr(message), id);
}
template <typename T, typename Extension>
constexpr uint32_t ExtensionNumber(
::hpb::internal::ExtensionIdentifier<T, Extension> id) {
return ::hpb::internal::PrivateAccess::GetExtensionNumber(id);
}
template <typename T>
typename T::Proxy CreateMessage(::hpb::Arena& arena) {
return typename T::Proxy(upb_Message_New(T::minitable(), arena.ptr()),
@ -486,17 +492,6 @@ void ClearMessage(hpb::internal::PtrOrRaw<T> message) {
upb_Message_Clear(hpb::internal::GetInternalMsg(ptr), minitable);
}
} // namespace hpb
namespace protos {
using hpb::Arena;
using hpb::ExtensionNotFoundError;
using hpb::MessageAllocationError;
using hpb::MessageDecodeError;
using hpb::MessageEncodeError;
using hpb::Ptr;
using hpb::SourceLocation;
template <typename T>
ABSL_MUST_USE_RESULT bool Parse(Ptr<T> message, absl::string_view bytes) {
static_assert(!std::is_const_v<T>);
@ -594,12 +589,6 @@ absl::StatusOr<absl::string_view> Serialize(Ptr<T> message, upb::Arena& arena,
arena.ptr(), options);
}
template <typename T, typename Extension>
constexpr uint32_t ExtensionNumber(
::hpb::internal::ExtensionIdentifier<T, Extension> id) {
return ::hpb::internal::PrivateAccess::GetExtensionNumber(id);
}
} // namespace protos
} // namespace hpb
#endif // PROTOBUF_HPB_HPB_H_

10
hpb_generator/gen_messages.cc
Unescape View File

@ -15,13 +15,13 @@
#include "absl/strings/ascii.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "google/protobuf/descriptor.h"
#include "google/protobuf/compiler/hpb/gen_accessors.h"
#include "google/protobuf/compiler/hpb/gen_enums.h"
#include "google/protobuf/compiler/hpb/gen_extensions.h"
#include "google/protobuf/compiler/hpb/gen_utils.h"
#include "google/protobuf/compiler/hpb/names.h"
#include "google/protobuf/compiler/hpb/output.h"
#include "google/protobuf/descriptor.h"
#include "upb_generator/common.h"
#include "upb_generator/file_layout.h"
@ -217,7 +217,7 @@ void WriteModelPublicDeclaration(
// for typetrait checking
output("using ExtendableType = $0;\n", ClassName(descriptor));
}
// Note: free function friends that are templates such as ::protos::Parse
// Note: free function friends that are templates such as ::hpb::Parse
// require explicit <$2> type parameter in declaration to be able to compile
// with gcc otherwise the compiler will fail with
// "has not been declared within namespace" error. Even though there is a
@ -246,9 +246,9 @@ void WriteModelPublicDeclaration(
friend struct ::hpb::internal::PrivateAccess;
friend Proxy;
friend CProxy;
friend absl::StatusOr<$2>(::protos::Parse<$2>(absl::string_view bytes,
int options));
friend absl::StatusOr<$2>(::protos::Parse<$2>(
friend absl::StatusOr<$2>(::hpb::Parse<$2>(absl::string_view bytes,
int options));
friend absl::StatusOr<$2>(::hpb::Parse<$2>(
absl::string_view bytes,
const ::hpb::ExtensionRegistry& extension_registry, int options));
friend upb_Arena* ::hpb::internal::GetArena<$0>($0* message);

18
hpb_generator/tests/test_generated.cc
Unescape View File

@ -887,7 +887,7 @@ TEST(CppGeneratedCode, SerializeUsingArena) {
TestModel model;
model.set_str1("Hello World");
::upb::Arena arena;
absl::StatusOr<absl::string_view> bytes = ::protos::Serialize(&model, arena);
absl::StatusOr<absl::string_view> bytes = ::hpb::Serialize(&model, arena);
EXPECT_EQ(true, bytes.ok());
TestModel parsed_model = ::protos::Parse<TestModel>(bytes.value()).value();
EXPECT_EQ("Hello World", parsed_model.str1());
@ -899,7 +899,7 @@ TEST(CppGeneratedCode, SerializeProxyUsingArena) {
model_proxy.set_str1("Hello World");
::upb::Arena arena;
absl::StatusOr<absl::string_view> bytes =
::protos::Serialize(&model_proxy, arena);
::hpb::Serialize(&model_proxy, arena);
EXPECT_EQ(true, bytes.ok());
TestModel parsed_model = ::protos::Parse<TestModel>(bytes.value()).value();
EXPECT_EQ("Hello World", parsed_model.str1());
@ -910,7 +910,7 @@ TEST(CppGeneratedCode, SerializeNestedMessageUsingArena) {
model.mutable_recursive_child()->set_str1("Hello World");
::upb::Arena arena;
::hpb::Ptr<const TestModel> child = model.recursive_child();
absl::StatusOr<absl::string_view> bytes = ::protos::Serialize(child, arena);
absl::StatusOr<absl::string_view> bytes = ::hpb::Serialize(child, arena);
EXPECT_EQ(true, bytes.ok());
TestModel parsed_model = ::protos::Parse<TestModel>(bytes.value()).value();
EXPECT_EQ("Hello World", parsed_model.str1());
@ -923,7 +923,7 @@ TEST(CppGeneratedCode, Parse) {
extension1.set_ext_name("Hello World");
EXPECT_EQ(true, ::hpb::SetExtension(&model, theme, extension1).ok());
::upb::Arena arena;
auto bytes = ::protos::Serialize(&model, arena);
auto bytes = ::hpb::Serialize(&model, arena);
EXPECT_EQ(true, bytes.ok());
TestModel parsed_model = ::protos::Parse<TestModel>(bytes.value()).value();
EXPECT_EQ("Test123", parsed_model.str1());
@ -937,7 +937,7 @@ TEST(CppGeneratedCode, ParseIntoPtrToModel) {
extension1.set_ext_name("Hello World");
EXPECT_EQ(true, ::hpb::SetExtension(&model, theme, extension1).ok());
::upb::Arena arena;
auto bytes = ::protos::Serialize(&model, arena);
auto bytes = ::hpb::Serialize(&model, arena);
EXPECT_EQ(true, bytes.ok());
::hpb::Ptr<TestModel> parsed_model = ::hpb::CreateMessage<TestModel>(arena);
EXPECT_TRUE(::protos::Parse(parsed_model, bytes.value()));
@ -957,7 +957,7 @@ TEST(CppGeneratedCode, ParseWithExtensionRegistry) {
extension1)
.ok());
::upb::Arena arena;
auto bytes = ::protos::Serialize(&model, arena);
auto bytes = ::hpb::Serialize(&model, arena);
EXPECT_EQ(true, bytes.ok());
::hpb::ExtensionRegistry extensions(
{&theme, &other_ext, &ThemeExtension::theme_extension}, arena);
@ -985,14 +985,14 @@ TEST(CppGeneratedCode, NameCollisions) {
TEST(CppGeneratedCode, SharedPointer) {
std::shared_ptr<TestModel> model = std::make_shared<TestModel>();
::upb::Arena arena;
auto bytes = ::protos::Serialize(model.get(), arena);
auto bytes = ::hpb::Serialize(model.get(), arena);
EXPECT_TRUE(::protos::Parse(model.get(), bytes.value()));
}
TEST(CppGeneratedCode, UniquePointer) {
auto model = std::make_unique<TestModel>();
::upb::Arena arena;
auto bytes = ::protos::Serialize(model.get(), arena);
auto bytes = ::hpb::Serialize(model.get(), arena);
EXPECT_TRUE(::protos::Parse(model.get(), bytes.value()));
}
@ -1221,7 +1221,7 @@ TEST(CppGeneratedCode, HasExtensionAndRegistry) {
// Now that we have a source model with extension data, serialize.
::hpb::Arena arena;
std::string data = std::string(::protos::Serialize(&source, arena).value());
std::string data = std::string(::hpb::Serialize(&source, arena).value());
// Test with ExtensionRegistry
::hpb::ExtensionRegistry extensions({&theme}, arena);

8
protos/protos.h
Unescape View File

@ -29,10 +29,18 @@ using hpb::ClearMessage;
using hpb::CloneMessage;
using hpb::CreateMessage;
using hpb::DeepCopy;
using hpb::Parse;
using hpb::Serialize;
using hpb::ClearExtension;
using hpb::ExtensionNotFoundError;
using hpb::ExtensionNumber;
using hpb::GetExtension;
using hpb::HasExtension;
using hpb::SetExtension;
using hpb::Arena;
using hpb::MessageAllocationError;
using hpb::Ptr;
} // namespace protos
#endif

Write Preview
Loading…
Cancel
Save