Fix regenerate protos scripts. (#32135)

* src/proto/grpc/core/stats.proto no longer exists

* remove PHP generated file for proto that no longer exists

* run src/ruby/pb/generate_proto_ruby.sh
pull/32152/head
Jan Tattermusch 2 years ago committed by GitHub
parent c5b8fd681f
commit 17cadf8689
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 85
      src/php/tests/qps/generated_code/Grpc/Core/Bucket.php
  2. 58
      src/php/tests/qps/generated_code/Grpc/Core/Histogram.php
  3. 113
      src/php/tests/qps/generated_code/Grpc/Core/Metric.php
  4. 58
      src/php/tests/qps/generated_code/Grpc/Core/Stats.php
  5. 6
      src/ruby/pb/generate_proto_ruby.sh
  6. 4
      src/ruby/qps/src/proto/grpc/testing/stats_pb.rb

@ -1,85 +0,0 @@
<?php
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: src/proto/grpc/core/stats.proto
namespace Grpc\Core;
use Google\Protobuf\Internal\GPBType;
use Google\Protobuf\Internal\RepeatedField;
use Google\Protobuf\Internal\GPBUtil;
/**
* Generated from protobuf message <code>grpc.core.Bucket</code>
*/
class Bucket extends \Google\Protobuf\Internal\Message
{
/**
* Generated from protobuf field <code>double start = 1;</code>
*/
protected $start = 0.0;
/**
* Generated from protobuf field <code>uint64 count = 2;</code>
*/
protected $count = 0;
/**
* Constructor.
*
* @param array $data {
* Optional. Data for populating the Message object.
*
* @type float $start
* @type int|string $count
* }
*/
public function __construct($data = NULL) {
\GPBMetadata\Src\Proto\Grpc\Core\Stats::initOnce();
parent::__construct($data);
}
/**
* Generated from protobuf field <code>double start = 1;</code>
* @return float
*/
public function getStart()
{
return $this->start;
}
/**
* Generated from protobuf field <code>double start = 1;</code>
* @param float $var
* @return $this
*/
public function setStart($var)
{
GPBUtil::checkDouble($var);
$this->start = $var;
return $this;
}
/**
* Generated from protobuf field <code>uint64 count = 2;</code>
* @return int|string
*/
public function getCount()
{
return $this->count;
}
/**
* Generated from protobuf field <code>uint64 count = 2;</code>
* @param int|string $var
* @return $this
*/
public function setCount($var)
{
GPBUtil::checkUint64($var);
$this->count = $var;
return $this;
}
}

@ -1,58 +0,0 @@
<?php
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: src/proto/grpc/core/stats.proto
namespace Grpc\Core;
use Google\Protobuf\Internal\GPBType;
use Google\Protobuf\Internal\RepeatedField;
use Google\Protobuf\Internal\GPBUtil;
/**
* Generated from protobuf message <code>grpc.core.Histogram</code>
*/
class Histogram extends \Google\Protobuf\Internal\Message
{
/**
* Generated from protobuf field <code>repeated .grpc.core.Bucket buckets = 1;</code>
*/
private $buckets;
/**
* Constructor.
*
* @param array $data {
* Optional. Data for populating the Message object.
*
* @type \Grpc\Core\Bucket[]|\Google\Protobuf\Internal\RepeatedField $buckets
* }
*/
public function __construct($data = NULL) {
\GPBMetadata\Src\Proto\Grpc\Core\Stats::initOnce();
parent::__construct($data);
}
/**
* Generated from protobuf field <code>repeated .grpc.core.Bucket buckets = 1;</code>
* @return \Google\Protobuf\Internal\RepeatedField
*/
public function getBuckets()
{
return $this->buckets;
}
/**
* Generated from protobuf field <code>repeated .grpc.core.Bucket buckets = 1;</code>
* @param \Grpc\Core\Bucket[]|\Google\Protobuf\Internal\RepeatedField $var
* @return $this
*/
public function setBuckets($var)
{
$arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Grpc\Core\Bucket::class);
$this->buckets = $arr;
return $this;
}
}

@ -1,113 +0,0 @@
<?php
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: src/proto/grpc/core/stats.proto
namespace Grpc\Core;
use Google\Protobuf\Internal\GPBType;
use Google\Protobuf\Internal\RepeatedField;
use Google\Protobuf\Internal\GPBUtil;
/**
* Generated from protobuf message <code>grpc.core.Metric</code>
*/
class Metric extends \Google\Protobuf\Internal\Message
{
/**
* Generated from protobuf field <code>string name = 1;</code>
*/
protected $name = '';
protected $value;
/**
* Constructor.
*
* @param array $data {
* Optional. Data for populating the Message object.
*
* @type string $name
* @type int|string $count
* @type \Grpc\Core\Histogram $histogram
* }
*/
public function __construct($data = NULL) {
\GPBMetadata\Src\Proto\Grpc\Core\Stats::initOnce();
parent::__construct($data);
}
/**
* Generated from protobuf field <code>string name = 1;</code>
* @return string
*/
public function getName()
{
return $this->name;
}
/**
* Generated from protobuf field <code>string name = 1;</code>
* @param string $var
* @return $this
*/
public function setName($var)
{
GPBUtil::checkString($var, True);
$this->name = $var;
return $this;
}
/**
* Generated from protobuf field <code>uint64 count = 10;</code>
* @return int|string
*/
public function getCount()
{
return $this->readOneof(10);
}
/**
* Generated from protobuf field <code>uint64 count = 10;</code>
* @param int|string $var
* @return $this
*/
public function setCount($var)
{
GPBUtil::checkUint64($var);
$this->writeOneof(10, $var);
return $this;
}
/**
* Generated from protobuf field <code>.grpc.core.Histogram histogram = 11;</code>
* @return \Grpc\Core\Histogram
*/
public function getHistogram()
{
return $this->readOneof(11);
}
/**
* Generated from protobuf field <code>.grpc.core.Histogram histogram = 11;</code>
* @param \Grpc\Core\Histogram $var
* @return $this
*/
public function setHistogram($var)
{
GPBUtil::checkMessage($var, \Grpc\Core\Histogram::class);
$this->writeOneof(11, $var);
return $this;
}
/**
* @return string
*/
public function getValue()
{
return $this->whichOneof("value");
}
}

@ -1,58 +0,0 @@
<?php
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: src/proto/grpc/core/stats.proto
namespace Grpc\Core;
use Google\Protobuf\Internal\GPBType;
use Google\Protobuf\Internal\RepeatedField;
use Google\Protobuf\Internal\GPBUtil;
/**
* Generated from protobuf message <code>grpc.core.Stats</code>
*/
class Stats extends \Google\Protobuf\Internal\Message
{
/**
* Generated from protobuf field <code>repeated .grpc.core.Metric metrics = 1;</code>
*/
private $metrics;
/**
* Constructor.
*
* @param array $data {
* Optional. Data for populating the Message object.
*
* @type \Grpc\Core\Metric[]|\Google\Protobuf\Internal\RepeatedField $metrics
* }
*/
public function __construct($data = NULL) {
\GPBMetadata\Src\Proto\Grpc\Core\Stats::initOnce();
parent::__construct($data);
}
/**
* Generated from protobuf field <code>repeated .grpc.core.Metric metrics = 1;</code>
* @return \Google\Protobuf\Internal\RepeatedField
*/
public function getMetrics()
{
return $this->metrics;
}
/**
* Generated from protobuf field <code>repeated .grpc.core.Metric metrics = 1;</code>
* @param \Grpc\Core\Metric[]|\Google\Protobuf\Internal\RepeatedField $var
* @return $this
*/
public function setMetrics($var)
{
$arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Grpc\Core\Metric::class);
$this->metrics = $arr;
return $this;
}
}

@ -33,12 +33,6 @@ $PROTOC -I . \
--ruby_out=src/ruby/pb \ --ruby_out=src/ruby/pb \
--plugin=$PLUGIN --plugin=$PLUGIN
$PROTOC -I . \
src/proto/grpc/core/stats.proto \
--grpc_out=src/ruby/qps \
--ruby_out=src/ruby/qps \
--plugin=$PLUGIN
$PROTOC -I . \ $PROTOC -I . \
-I third_party/protobuf/src \ -I third_party/protobuf/src \
src/proto/grpc/testing/{messages,payloads,stats,benchmark_service,report_qps_scenario_service,worker_service,control}.proto \ src/proto/grpc/testing/{messages,payloads,stats,benchmark_service,report_qps_scenario_service,worker_service,control}.proto \

@ -3,8 +3,6 @@
require 'google/protobuf' require 'google/protobuf'
require 'src/proto/grpc/core/stats_pb'
Google::Protobuf::DescriptorPool.generated_pool.build do Google::Protobuf::DescriptorPool.generated_pool.build do
add_file("src/proto/grpc/testing/stats.proto", :syntax => :proto3) do add_file("src/proto/grpc/testing/stats.proto", :syntax => :proto3) do
add_message "grpc.testing.ServerStats" do add_message "grpc.testing.ServerStats" do
@ -14,7 +12,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
optional :total_cpu_time, :uint64, 4 optional :total_cpu_time, :uint64, 4
optional :idle_cpu_time, :uint64, 5 optional :idle_cpu_time, :uint64, 5
optional :cq_poll_count, :uint64, 6 optional :cq_poll_count, :uint64, 6
optional :core_stats, :message, 7, "grpc.core.Stats"
end end
add_message "grpc.testing.HistogramParams" do add_message "grpc.testing.HistogramParams" do
optional :resolution, :double, 1 optional :resolution, :double, 1
@ -39,7 +36,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
optional :time_system, :double, 4 optional :time_system, :double, 4
repeated :request_results, :message, 5, "grpc.testing.RequestResultCount" repeated :request_results, :message, 5, "grpc.testing.RequestResultCount"
optional :cq_poll_count, :uint64, 6 optional :cq_poll_count, :uint64, 6
optional :core_stats, :message, 7, "grpc.core.Stats"
end end
end end
end end

Loading…
Cancel
Save