Bug#38434120 Add support for recent versions of protobuf

Homebrew on macOS currently has protoc 6.32.1. It will generate functions returning std::string_view, or absl::string_view, rather than std::string. see https://protobuf.dev/editions/features/#string_type We have application code which assume std::string. The fix is to convert string_view to string where necessary. Our .proto files should probably be upgraded at some point, but for now, fix the application code instead. Note that our "bundled" protobuf will likely be upgraded to something similar to what Homebrew has now. Change-Id: Ib2a39c69afd0e37c1e38dd20a8a9b1ece6d73903 (cherry picked from commit 61cbee439476c65a7fb9f7b79871e638f64b39e9)

Author: Tor Didriksen

plugin/x/client/xprotocol_impl.cc

@@ -782,7 +782,7 @@ std::unique_ptr<XProtocol::Message> Protocol_impl::deserialize_message(
  DBUG_LOG("debug", "Deserialize message: " << ret_val->GetTypeName());
  if (!ret_val->ParseFromCodedStream(input_stream)) {
  std::string error_message(ERR_MSG_MESSAGE_NOT_INITIALIZED);
- error_message += "Name:" + ret_val->GetTypeName() + ", ";
+ error_message += "Name:" + std::string(ret_val->GetTypeName()) + ", ";
  error_message += ret_val->InitializationErrorString();
  *out_error = XError(CR_MALFORMED_PACKET, error_message);
 
@@ -816,7 +816,7 @@ std::unique_ptr<XProtocol::Message> Protocol_impl::deserialize_received_message(
 
  if (!ret_val->IsInitialized()) {
  std::string err(ERR_MSG_MESSAGE_NOT_INITIALIZED);
- err += "Name:" + ret_val->GetTypeName() + ", ";
+ err += "Name:" + std::string(ret_val->GetTypeName()) + ", ";
  err += ret_val->InitializationErrorString();
  *out_error = XError(CR_MALFORMED_PACKET, err);
 
@@ -1122,7 +1122,7 @@ XProtocol::Message *Protocol_impl::recv_message_with_header(
 
  if (!m_compressed.ParseFromCodedStream(&cis)) {
  std::string error_message(ERR_MSG_MESSAGE_NOT_INITIALIZED);
- error_message += "Name:" + m_compressed.GetTypeName() + ", ";
+ error_message += "Name:" + std::string(m_compressed.GetTypeName()) + ", ";
  error_message += m_compressed.InitializationErrorString();
  *out_error = XError(CR_MALFORMED_PACKET, error_message);
  return nullptr;

plugin/x/protocol/plugin/encoder_file_output.h

@@ -79,7 +79,7 @@ class Encoder_file_output : public File_output {
  return;
 
  write_to_context(context, "");
- write_to_context(context, "struct ", message->name(), " {");
+ write_to_context(context, "struct ", std::string(message->name()), " {");
 
  if (message->options().HasExtension(Mysqlx::server_message_id)) {
  const auto server_id_numeric = static_cast<int>(
@@ -97,7 +97,8 @@ class Encoder_file_output : public File_output {
  bool is_reserved = false;
  const auto field = message->field(i);
  const auto field_tag = std::to_string(field->number());
- const auto field_name = get_cpp_field_name(field->name(), &is_reserved);
+ const auto field_name =
+ get_cpp_field_name(std::string(field->name()), &is_reserved);
 
  if (is_reserved) {
  write_to_context(context,
@@ -129,7 +130,7 @@ class Encoder_file_output : public File_output {
 
  // Check if we there is a message containing Server message ID
  if (0 == m_used_message_ids.count(enum_value->number())) {
- std::string value = " " + enum_value->name() + " = " +
+ std::string value = " " + std::string(enum_value->name()) + " = " +
  std::to_string(enum_value->number());
 
  values.push_back(value);

plugin/x/protocol/plugin/message_field_chain.cc

@@ -58,7 +58,7 @@ bool Message_field_chain::begin_validate_field(const FieldDescriptor *field,
 
  // Check against cycles in Message dependencies graph
  const bool was_node_visited =
- message && 0 != m_types_done.count(message->full_name());
+ message && 0 != m_types_done.count(std::string(message->full_name()));
 
  if (nullptr == message || was_node_visited || 0 == message->field_count()) {
  m_output_file->append_chain(m_context, chain);
@@ -74,7 +74,7 @@ bool Message_field_chain::begin_validate_field(const FieldDescriptor *field,
 
 void Message_field_chain::end_validate_field(const FieldDescriptor *field,
  const Descriptor *message) {
- m_types_done.erase(message->full_name());
+ m_types_done.erase(std::string(message->full_name()));
  const auto position = m_chain.find_last_of(".");
 
  if (std::string::npos != position) m_chain.resize(position);

plugin/x/protocol/plugin/messages_used_by_server.cc

@@ -49,14 +49,14 @@ bool Messages_used_by_server::begin_validate_field(const FieldDescriptor *field,
  const auto &message_options = message->options();
 
  if (!message_options.HasExtension(Mysqlx::server_message_id)) {
- if (0 == m_forced_packages.count(message->file()->package()))
+ if (0 == m_forced_packages.count(std::string(message->file()->package())))
  return false;
  }
  }
 
  // Check against cycles in Message dependencies graph
  const bool was_node_visited =
- message && 0 != m_types_done.count(message->full_name());
+ message && 0 != m_types_done.count(std::string(message->full_name()));
 
  if (nullptr == message || was_node_visited) {
  return false;

plugin/x/protocol/stream/decompression_input_stream.h

@@ -93,9 +93,7 @@ class Decompression_input_stream
  return Skip(count - left);
  }
 
- google::protobuf::int64 ByteCount() const override {
- return m_all + m_output_buffer_offset;
- }
+ int64_t ByteCount() const override { return m_all + m_output_buffer_offset; }
 
  private:
  bool ReadCompressed() {

plugin/x/src/io/vio_input_stream.cc

@@ -141,9 +141,7 @@ bool Vio_input_stream::Skip(int count) {
  return true;
 }
 
-Vio_input_stream::gint64 Vio_input_stream::ByteCount() const {
- return m_bytes_count;
-}
+int64_t Vio_input_stream::ByteCount() const { return m_bytes_count; }
 
 bool Vio_input_stream::peek_data(const void **data, int *size) {
  if (m_buffer_data_pos < m_buffer_data_count) {

plugin/x/src/io/vio_input_stream.h

@@ -28,16 +28,14 @@
 
 #include <google/protobuf/io/zero_copy_stream.h>
 #include <my_inttypes.h>
+#include <cstdint>
 #include <memory>
 
 #include "plugin/x/src/interface/vio.h"
 
 namespace xpl {
 
 class Vio_input_stream : public google::protobuf::io::ZeroCopyInputStream {
- public:
- using gint64 = google::protobuf::int64;
-
  public:
  explicit Vio_input_stream(const std::shared_ptr<iface::Vio> &connection);
  ~Vio_input_stream() override;
@@ -58,7 +56,7 @@ class Vio_input_stream : public google::protobuf::io::ZeroCopyInputStream {
  bool Next(const void **data, int *size) override;
  void BackUp(int count) override;
  bool Skip(int count) override;
- gint64 ByteCount() const override;
+ int64_t ByteCount() const override;
 
  private:
  bool read_more_data();

plugin/x/src/ngs/protocol_encoder.cc

@@ -257,7 +257,7 @@ void Protocol_encoder::log_protobuf(const unsigned id,
  }
 #else
  log_debug("%u: %s, Type: %s", id, direction_name,
- message->GetTypeName().c_str());
+ std::string(message->GetTypeName()).c_str());
 #endif
 }
 

plugin/x/src/prepare_param_handler.cc

@@ -147,8 +147,9 @@ ngs::Error_code Prepare_param_handler::prepare_parameters(
  "' and of type '%s' is not supported for binding"
  " to prepared statement",
  ph.m_id,
- arg.has_scalar() ? arg.scalar().GetTypeName().c_str()
- : arg.GetTypeName().c_str());
+ arg.has_scalar()
+ ? std::string(arg.scalar().GetTypeName()).c_str()
+ : std::string(arg.GetTypeName()).c_str());
  }
  }
  return ngs::Success();

plugin/x/tests/driver/connector/session_holder.cc

@@ -357,21 +357,24 @@ xcl::Handler_result Session_holder::count_received_messages(
  const auto server_message_name =
  Mysqlx::ServerMessages::descriptor()->full_name();
  const bool is_empty_message = (protobuf_message_name == server_message_name);
- const std::string &msg_name = !is_empty_message
-  ? msg.GetDescriptor()->full_name()
-  : server_msgs_by_id[msg_id].second;
+ const std::string &msg_name =
+ !is_empty_message ? std::string(msg.GetDescriptor()->full_name())
+ : server_msgs_by_id[msg_id].second;
 
  ++m_received_msg_counters[msg_name];
 
  if (msg_name != Mysqlx::Notice::Frame::descriptor()->full_name())
  return xcl::Handler_result::Continue;
 
  static const std::array<std::string, 5> k_notice_type_id = {
- Mysqlx::Notice::Warning::descriptor()->full_name(),
- Mysqlx::Notice::SessionVariableChanged::descriptor()->full_name(),
- Mysqlx::Notice::SessionStateChanged::descriptor()->full_name(),
- Mysqlx::Notice::GroupReplicationStateChanged::descriptor()->full_name(),
- Mysqlx::Notice::ServerHello::descriptor()->full_name(),
+ std::string(Mysqlx::Notice::Warning::descriptor()->full_name()),
+ std::string(
+ Mysqlx::Notice::SessionVariableChanged::descriptor()->full_name()),
+ std::string(
+ Mysqlx::Notice::SessionStateChanged::descriptor()->full_name()),
+ std::string(Mysqlx::Notice::GroupReplicationStateChanged::descriptor()
+ ->full_name()),
+ std::string(Mysqlx::Notice::ServerHello::descriptor()->full_name()),
  };
 
  const auto notice_type =