From 10cbdfef5f40dd0fc9381474ae8c69bba7e8fb6f Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Fri, 9 Sep 2022 11:26:50 -0700 Subject: [PATCH 1/5] Sync from Piper @473279986 PROTOBUF_SYNC_PIPER --- benchmarks/BUILD.bazel | 121 -- benchmarks/README.md | 239 -- benchmarks/__init__.py | 0 benchmarks/benchmarks.proto | 63 - benchmarks/cpp/BUILD.bazel | 36 - benchmarks/cpp/cpp_benchmark.cc | 254 --- benchmarks/datasets/BUILD.bazel | 122 -- .../google_message1/proto2/BUILD.bazel | 92 - .../proto2/benchmark_message1_proto2.proto | 108 - .../proto2/dataset.google_message1_proto2.pb | Bin 289 -> 0 bytes .../google_message1/proto3/BUILD.bazel | 81 - .../proto3/benchmark_message1_proto3.proto | 108 - .../proto3/dataset.google_message1_proto3.pb | Bin 289 -> 0 bytes .../datasets/google_message2/BUILD.bazel | 92 - .../google_message2/benchmark_message2.proto | 108 - .../dataset.google_message2.pb | Bin 84625 -> 0 bytes .../datasets/google_message3/BUILD.bazel | 94 - .../google_message3/benchmark_message3.proto | 566 ----- .../benchmark_message3_1.proto | 1298 ----------- .../benchmark_message3_2.proto | 528 ----- .../benchmark_message3_3.proto | 496 ----- .../benchmark_message3_4.proto | 514 ----- .../benchmark_message3_5.proto | 496 ----- .../benchmark_message3_6.proto | 483 ----- .../benchmark_message3_7.proto | 81 - .../benchmark_message3_8.proto | 1925 ----------------- .../datasets/google_message4/BUILD.bazel | 79 - .../google_message4/benchmark_message4.proto | 484 ----- .../benchmark_message4_1.proto | 500 ----- .../benchmark_message4_2.proto | 316 --- .../benchmark_message4_3.proto | 779 ------- benchmarks/google_size.proto | 138 -- benchmarks/internal.bzl | 39 - benchmarks/java/BUILD.bazel | 55 - .../protobuf/ProtoCaliperBenchmark.java | 207 -- benchmarks/php/BUILD.bazel | 69 - benchmarks/php/PhpBenchmark.php | 170 -- benchmarks/php/autoload.php | 25 - benchmarks/python/BUILD.bazel | 72 - benchmarks/python/__init__.py | 0 benchmarks/python/py_benchmark.py | 159 -- .../python/python_benchmark_messages.cc | 31 - benchmarks/util/BUILD.bazel | 50 - benchmarks/util/__init__.py | 0 benchmarks/util/big_query_utils.py | 189 -- benchmarks/util/compatibility.bzl | 105 - benchmarks/util/data_proto2_to_proto3_util.h | 64 - benchmarks/util/proto3_data_stripper.cc | 74 - .../util/protoc-gen-proto2_to_proto3.cc | 118 - benchmarks/util/result_parser.py | 352 --- benchmarks/util/result_uploader.py | 107 - .../util/schema_proto2_to_proto3_util.h | 206 -- 52 files changed, 12293 deletions(-) delete mode 100644 benchmarks/BUILD.bazel delete mode 100644 benchmarks/README.md delete mode 100644 benchmarks/__init__.py delete mode 100644 benchmarks/benchmarks.proto delete mode 100644 benchmarks/cpp/BUILD.bazel delete mode 100644 benchmarks/cpp/cpp_benchmark.cc delete mode 100644 benchmarks/datasets/BUILD.bazel delete mode 100644 benchmarks/datasets/google_message1/proto2/BUILD.bazel delete mode 100644 benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.proto delete mode 100644 benchmarks/datasets/google_message1/proto2/dataset.google_message1_proto2.pb delete mode 100644 benchmarks/datasets/google_message1/proto3/BUILD.bazel delete mode 100644 benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.proto delete mode 100644 benchmarks/datasets/google_message1/proto3/dataset.google_message1_proto3.pb delete mode 100644 benchmarks/datasets/google_message2/BUILD.bazel delete mode 100644 benchmarks/datasets/google_message2/benchmark_message2.proto delete mode 100644 benchmarks/datasets/google_message2/dataset.google_message2.pb delete mode 100644 benchmarks/datasets/google_message3/BUILD.bazel delete mode 100644 benchmarks/datasets/google_message3/benchmark_message3.proto delete mode 100644 benchmarks/datasets/google_message3/benchmark_message3_1.proto delete mode 100644 benchmarks/datasets/google_message3/benchmark_message3_2.proto delete mode 100644 benchmarks/datasets/google_message3/benchmark_message3_3.proto delete mode 100644 benchmarks/datasets/google_message3/benchmark_message3_4.proto delete mode 100644 benchmarks/datasets/google_message3/benchmark_message3_5.proto delete mode 100644 benchmarks/datasets/google_message3/benchmark_message3_6.proto delete mode 100644 benchmarks/datasets/google_message3/benchmark_message3_7.proto delete mode 100644 benchmarks/datasets/google_message3/benchmark_message3_8.proto delete mode 100644 benchmarks/datasets/google_message4/BUILD.bazel delete mode 100644 benchmarks/datasets/google_message4/benchmark_message4.proto delete mode 100644 benchmarks/datasets/google_message4/benchmark_message4_1.proto delete mode 100644 benchmarks/datasets/google_message4/benchmark_message4_2.proto delete mode 100644 benchmarks/datasets/google_message4/benchmark_message4_3.proto delete mode 100644 benchmarks/google_size.proto delete mode 100644 benchmarks/internal.bzl delete mode 100644 benchmarks/java/BUILD.bazel delete mode 100644 benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java delete mode 100644 benchmarks/php/BUILD.bazel delete mode 100644 benchmarks/php/PhpBenchmark.php delete mode 100644 benchmarks/php/autoload.php delete mode 100644 benchmarks/python/BUILD.bazel delete mode 100644 benchmarks/python/__init__.py delete mode 100644 benchmarks/python/py_benchmark.py delete mode 100644 benchmarks/python/python_benchmark_messages.cc delete mode 100644 benchmarks/util/BUILD.bazel delete mode 100644 benchmarks/util/__init__.py delete mode 100755 benchmarks/util/big_query_utils.py delete mode 100644 benchmarks/util/compatibility.bzl delete mode 100644 benchmarks/util/data_proto2_to_proto3_util.h delete mode 100644 benchmarks/util/proto3_data_stripper.cc delete mode 100644 benchmarks/util/protoc-gen-proto2_to_proto3.cc delete mode 100644 benchmarks/util/result_parser.py delete mode 100644 benchmarks/util/result_uploader.py delete mode 100644 benchmarks/util/schema_proto2_to_proto3_util.h diff --git a/benchmarks/BUILD.bazel b/benchmarks/BUILD.bazel deleted file mode 100644 index 60a9092854..0000000000 --- a/benchmarks/BUILD.bazel +++ /dev/null @@ -1,121 +0,0 @@ -load("@rules_cc//cc:defs.bzl", "cc_proto_library") -load("@rules_java//java:defs.bzl", "java_proto_library") -load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix") -load("@rules_proto//proto:defs.bzl", "proto_library") -load("//:protobuf.bzl", "internal_php_proto_library", "internal_py_proto_library") - -################################################################################ -# Benchmark Protos -################################################################################ - -proto_library( - name = "benchmarks_proto", - srcs = [ - "benchmarks.proto", - ], - strip_import_prefix = "/benchmarks", - visibility = [ - "//benchmarks:__subpackages__", - ], -) - -cc_proto_library( - name = "benchmarks_cc_proto", - visibility = [ - "//benchmarks:__subpackages__", - ], - deps = [ - "benchmarks_proto", - ], -) - -java_proto_library( - name = "benchmarks_java_proto", - visibility = [ - "//benchmarks:__subpackages__", - ], - deps = [ - "benchmarks_proto", - ], -) - -internal_php_proto_library( - name = "benchmarks_php_proto", - srcs = ["benchmarks.proto"], - outs = [ - "Benchmarks/BenchmarkDataset.php", - "GPBMetadata/Benchmarks.php", - ], - visibility = [ - "//benchmarks:__subpackages__", - ], -) - -internal_py_proto_library( - name = "benchmarks_py_proto", - srcs = ["benchmarks.proto"], - visibility = [ - "//benchmarks:__subpackages__", - ], -) - -proto_library( - name = "google_size_proto", - srcs = [ - "google_size.proto", - ], - strip_import_prefix = "/benchmarks", - visibility = [ - "//benchmarks:__subpackages__", - ], -) - -cc_proto_library( - name = "google_size_cc_proto", - visibility = [ - "//benchmarks:__subpackages__", - ], - deps = [ - "google_size_proto", - ], -) - -java_proto_library( - name = "google_size_java_proto", - visibility = [ - "//benchmarks:__subpackages__", - ], - deps = [ - "google_size_proto", - ], -) - -################################################################################ -# Distribution files -################################################################################ - -pkg_files( - name = "dist_files", - srcs = glob(["*"]), - strip_prefix = strip_prefix.from_root(""), -) - -# Convenience filegroup for all files that should be packaged. -pkg_filegroup( - name = "all_dist_files", - srcs = [ - ":dist_files", - "//benchmarks/cpp:dist_files", - "//benchmarks/datasets:dist_files", # not in autotools dist - "//benchmarks/datasets/google_message1/proto2:dist_files", - "//benchmarks/datasets/google_message1/proto3:dist_files", - "//benchmarks/datasets/google_message2:dist_files", - "//benchmarks/datasets/google_message3:dist_files", - "//benchmarks/datasets/google_message4:dist_files", - "//benchmarks/java:dist_files", - "//benchmarks/php:dist_files", - "//benchmarks/python:dist_files", - "//benchmarks/util:dist_files", - ], - visibility = ["//pkg:__pkg__"], -) diff --git a/benchmarks/README.md b/benchmarks/README.md deleted file mode 100644 index 70c359660b..0000000000 --- a/benchmarks/README.md +++ /dev/null @@ -1,239 +0,0 @@ - -# Protocol Buffers Benchmarks - -This directory contains benchmarking schemas and data sets that you -can use to test a variety of performance scenarios against your -protobuf language runtime. If you are looking for performance -numbers of officially supported languages, see [Protobuf Performance]( -https://github.com/protocolbuffers/protobuf/blob/main/docs/performance.md). - -## Prerequisite - -First, you need to follow the instruction in the root directory's README to -build your language's protobuf, then: - -### CPP -You need to install [cmake](https://cmake.org/) before building the benchmark. - -We are using [google/benchmark](https://github.com/google/benchmark) as the -benchmark tool for testing cpp. This will be automatically made during build the -cpp benchmark. - -The cpp protobuf performance can be improved by linking with -[TCMalloc](https://google.github.io/tcmalloc). - -### Java -We're using maven to build the java benchmarks, which is the same as to build -the Java protobuf. There're no other tools need to install. We're using -[google/caliper](https://github.com/google/caliper) as benchmark tool, which -can be automatically included by maven. - -### Python -We're using python C++ API for testing the generated -CPP proto version of python protobuf, which is also a prerequisite for Python -protobuf cpp implementation. You need to install the correct version of Python -C++ extension package before run generated CPP proto version of Python -protobuf's benchmark. e.g. under Ubuntu, you need to - -``` -$ sudo apt-get install python-dev -$ sudo apt-get install python3-dev -``` -And you also need to make sure `pkg-config` is installed. - -### Go -Go protobufs are maintained at [github.com/golang/protobuf]( -http://github.com/golang/protobuf). If not done already, you need to install the -toolchain and the Go protoc-gen-go plugin for protoc. - -To install protoc-gen-go, run: - -``` -$ go get -u github.com/golang/protobuf/protoc-gen-go -$ export PATH=$PATH:$(go env GOPATH)/bin -``` - -The first command installs `protoc-gen-go` into the `bin` directory in your local `GOPATH`. -The second command adds the `bin` directory to your `PATH` so that `protoc` can locate the plugin later. - -### PHP -PHP benchmark's requirement is the same as PHP protobuf's requirements. The benchmark will automatically -include PHP protobuf's src and build the c extension if required. - -### Node.js -Node.js benchmark need [node](https://nodejs.org/en/)(higher than V6) and [npm](https://www.npmjs.com/) package manager installed. This benchmark is using the [benchmark](https://www.npmjs.com/package/benchmark) framework to test, which needn't to manually install. And another prerequisite is [protobuf js](https://github.com/protocolbuffers/protobuf/tree/main/js), which needn't to manually install either - -### C# -The C# benchmark code is built as part of the main Google.Protobuf -solution. It requires the .NET Core SDK, and depends on -[BenchmarkDotNet](https://github.com/dotnet/BenchmarkDotNet), which -will be downloaded automatically. - -## Run instructions - -To run all the benchmark dataset: - -### Java: - -First build the Java binary in the usual way with Maven: - -``` -$ cd java -$ mvn install -``` - -Assuming that completes successfully, - -``` -$ cd ../benchmarks -$ make java -``` - -### CPP: - -``` -$ make cpp -``` - -For linking with tcmalloc: - -``` -$ env LD_PRELOAD={directory to libtcmalloc.so} make cpp -``` - -### Python: - -We have three versions of python protobuf implementation: pure python, cpp -reflection and cpp generated code. To run these version benchmark, you need to: - -#### Pure Python: - -``` -$ make python-pure-python -``` - -#### CPP reflection: - -``` -$ make python-cpp-reflection -``` - -#### CPP generated code: - -``` -$ make python-cpp-generated-code -``` - -### Go -``` -$ make go -``` - - -### PHP -We have two version of php protobuf implementation: pure php, php with c extension. To run these version benchmark, you need to: -#### Pure PHP -``` -$ make php -``` -#### PHP with c extension -``` -$ make php_c -``` - -### Node.js -``` -$ make js -``` - -To run a specific dataset or run with specific options: - -### Java: - -``` -$ make java-benchmark -$ ./java-benchmark $(specific generated dataset file name) [$(caliper options)] -``` - -### CPP: - -``` -$ make cpp-benchmark -$ ./cpp-benchmark $(specific generated dataset file name) [$(benchmark options)] -``` - -### Python: - -For Python benchmark we have `--json` for outputting the json result - -#### Pure Python: - -``` -$ make python-pure-python-benchmark -$ ./python-pure-python-benchmark [--json] $(specific generated dataset file name) -``` - -#### CPP reflection: - -``` -$ make python-cpp-reflection-benchmark -$ ./python-cpp-reflection-benchmark [--json] $(specific generated dataset file name) -``` - -#### CPP generated code: - -``` -$ make python-cpp-generated-code-benchmark -$ ./python-cpp-generated-code-benchmark [--json] $(specific generated dataset file name) -``` - -### Go: -``` -$ make go-benchmark -$ ./go-benchmark $(specific generated dataset file name) [go testing options] -``` - -### PHP -#### Pure PHP -``` -$ make php-benchmark -$ ./php-benchmark $(specific generated dataset file name) -``` -#### PHP with c extension -``` -$ make php-c-benchmark -$ ./php-c-benchmark $(specific generated dataset file name) -``` - -### Node.js -``` -$ make js-benchmark -$ ./js-benchmark $(specific generated dataset file name) -``` - -### C# -From `csharp/src/Google.Protobuf.Benchmarks`, run: - -``` -$ dotnet run -c Release -``` - -We intend to add support for this within the makefile in due course. - -## Benchmark datasets - -Each data set is in the format of benchmarks.proto: - -1. name is the benchmark dataset's name. -2. message_name is the benchmark's message type full name (including package and message name) -3. payload is the list of raw data. - -The schema for the datasets is described in `benchmarks.proto`. - -Benchmark likely want to run several benchmarks against each data set (parse, -serialize, possibly JSON, possibly using different APIs, etc). - -We would like to add more data sets. In general we will favor data sets -that make the overall suite diverse without being too large or having -too many similar tests. Ideally everyone can run through the entire -suite without the test run getting too long. diff --git a/benchmarks/__init__.py b/benchmarks/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/benchmarks/benchmarks.proto b/benchmarks/benchmarks.proto deleted file mode 100644 index 51c0b54877..0000000000 --- a/benchmarks/benchmarks.proto +++ /dev/null @@ -1,63 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; -package benchmarks; -option java_package = "com.google.protobuf.benchmarks"; - -message BenchmarkDataset { - // Name of the benchmark dataset. This should be unique across all datasets. - // Should only contain word characters: [a-zA-Z0-9_] - string name = 1; - - // Fully-qualified name of the protobuf message for this dataset. - // It will be one of the messages defined benchmark_messages_proto2.proto - // or benchmark_messages_proto3.proto. - // - // Implementations that do not support reflection can implement this with - // an explicit "if/else" chain that lists every known message defined - // in those files. - string message_name = 2; - - // The payload(s) for this dataset. They should be parsed or serialized - // in sequence, in a loop, ie. - // - // while (!benchmarkDone) { // Benchmark runner decides when to exit. - // for (i = 0; i < benchmark.payload.length; i++) { - // parse(benchmark.payload[i]) - // } - // } - // - // This is intended to let datasets include a variety of data to provide - // potentially more realistic results than just parsing the same message - // over and over. A single message parsed repeatedly could yield unusually - // good branch prediction performance. - repeated bytes payload = 3; -} diff --git a/benchmarks/cpp/BUILD.bazel b/benchmarks/cpp/BUILD.bazel deleted file mode 100644 index 72100e600e..0000000000 --- a/benchmarks/cpp/BUILD.bazel +++ /dev/null @@ -1,36 +0,0 @@ -load("@rules_cc//cc:defs.bzl", "cc_binary") -load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix") -load("//benchmarks:internal.bzl", "internal_benchmark_test") - -# The benchmark binary which can be run over any dataset. -cc_binary( - name = "cpp_benchmark", - srcs = [ - "cpp_benchmark.cc", - ], - deps = [ - "//:protobuf", - "//benchmarks:benchmarks_cc_proto", - "//benchmarks/datasets:cc_protos", - "@com_github_google_benchmark//:benchmark_main", - ], -) - -# A pre-configured binary using the checked in datasets. -internal_benchmark_test( - name = "cpp", - binary = ":cpp_benchmark", - datasets = [ - "//benchmarks/datasets", - ], -) - -pkg_files( - name = "dist_files", - srcs = [ - "BUILD.bazel", - "cpp_benchmark.cc", - ], - strip_prefix = strip_prefix.from_root(""), - visibility = ["//benchmarks:__pkg__"], -) diff --git a/benchmarks/cpp/cpp_benchmark.cc b/benchmarks/cpp/cpp_benchmark.cc deleted file mode 100644 index ffb3a3dc66..0000000000 --- a/benchmarks/cpp/cpp_benchmark.cc +++ /dev/null @@ -1,254 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#include -#include - -#include "benchmark/benchmark.h" -#include "benchmarks.pb.h" -#include "benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.h" -#include "benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.h" -#include "benchmarks/datasets/google_message2/benchmark_message2.pb.h" -#include "benchmarks/datasets/google_message3/benchmark_message3.pb.h" -#include "benchmarks/datasets/google_message4/benchmark_message4.pb.h" - -#define PREFIX "dataset." -#define SUFFIX ".pb" - -using benchmarks::BenchmarkDataset; -using google::protobuf::Arena; -using google::protobuf::Descriptor; -using google::protobuf::DescriptorPool; -using google::protobuf::Message; -using google::protobuf::MessageFactory; - -class Fixture : public benchmark::Fixture { - public: - Fixture(const BenchmarkDataset& dataset, const std::string& suffix) { - for (int i = 0; i < dataset.payload_size(); i++) { - payloads_.push_back(dataset.payload(i)); - } - - const Descriptor* d = - DescriptorPool::generated_pool()->FindMessageTypeByName( - dataset.message_name()); - - if (!d) { - std::cerr << "Couldn't find message named '" << dataset.message_name() - << "\n"; - } - - prototype_ = MessageFactory::generated_factory()->GetPrototype(d); - SetName((dataset.name() + suffix).c_str()); - } - - protected: - std::vector payloads_; - const Message* prototype_; -}; - -class WrappingCounter { - public: - WrappingCounter(size_t limit) : value_(0), limit_(limit) {} - - size_t Next() { - size_t ret = value_; - if (++value_ == limit_) { - value_ = 0; - } - return ret; - } - - private: - size_t value_; - size_t limit_; -}; - -template -class ParseNewFixture : public Fixture { - public: - ParseNewFixture(const BenchmarkDataset& dataset) - : Fixture(dataset, "_parse_new") {} - - virtual void BenchmarkCase(benchmark::State& state) { - WrappingCounter i(payloads_.size()); - size_t total = 0; - - while (state.KeepRunning()) { - T m; - const std::string& payload = payloads_[i.Next()]; - total += payload.size(); - m.ParseFromString(payload); - } - - state.SetBytesProcessed(total); - } -}; - -template -class ParseNewArenaFixture : public Fixture { - public: - ParseNewArenaFixture(const BenchmarkDataset& dataset) - : Fixture(dataset, "_parse_newarena") {} - - virtual void BenchmarkCase(benchmark::State& state) { - WrappingCounter i(payloads_.size()); - size_t total = 0; - Arena arena; - - while (state.KeepRunning()) { - arena.Reset(); - Message* m = Arena::CreateMessage(&arena); - const std::string& payload = payloads_[i.Next()]; - total += payload.size(); - m->ParseFromString(payload); - } - - state.SetBytesProcessed(total); - } -}; - -template -class ParseReuseFixture : public Fixture { - public: - ParseReuseFixture(const BenchmarkDataset& dataset) - : Fixture(dataset, "_parse_reuse") {} - - virtual void BenchmarkCase(benchmark::State& state) { - T m; - WrappingCounter i(payloads_.size()); - size_t total = 0; - - while (state.KeepRunning()) { - const std::string& payload = payloads_[i.Next()]; - total += payload.size(); - m.ParseFromString(payload); - } - - state.SetBytesProcessed(total); - } -}; - -template -class SerializeFixture : public Fixture { - public: - SerializeFixture(const BenchmarkDataset& dataset) - : Fixture(dataset, "_serialize") { - for (size_t i = 0; i < payloads_.size(); i++) { - message_.push_back(new T); - message_.back()->ParseFromString(payloads_[i]); - } - } - - ~SerializeFixture() { - for (size_t i = 0; i < message_.size(); i++) { - delete message_[i]; - } - } - - virtual void BenchmarkCase(benchmark::State& state) { - size_t total = 0; - std::string str; - WrappingCounter i(payloads_.size()); - - while (state.KeepRunning()) { - str.clear(); - message_[i.Next()]->SerializeToString(&str); - total += str.size(); - } - - state.SetBytesProcessed(total); - } - - private: - std::vector message_; -}; - -std::string ReadFile(const std::string& name) { - std::ifstream file(name.c_str()); - GOOGLE_CHECK(file.is_open()) << "Couldn't find file '" << name << - "', please make sure you are running " - "this command from the benchmarks/ " - "directory.\n"; - return std::string((std::istreambuf_iterator(file)), - std::istreambuf_iterator()); -} - -template -void RegisterBenchmarksForType(const BenchmarkDataset& dataset) { - ::benchmark::internal::RegisterBenchmarkInternal( - new ParseNewFixture(dataset)); - ::benchmark::internal::RegisterBenchmarkInternal( - new ParseReuseFixture(dataset)); - ::benchmark::internal::RegisterBenchmarkInternal( - new ParseNewArenaFixture(dataset)); - ::benchmark::internal::RegisterBenchmarkInternal( - new SerializeFixture(dataset)); -} - -void RegisterBenchmarks(const std::string& dataset_bytes) { - BenchmarkDataset dataset; - GOOGLE_CHECK(dataset.ParseFromString(dataset_bytes)); - - if (dataset.message_name() == "benchmarks.proto3.GoogleMessage1") { - RegisterBenchmarksForType(dataset); - } else if (dataset.message_name() == "benchmarks.proto2.GoogleMessage1") { - RegisterBenchmarksForType(dataset); - } else if (dataset.message_name() == "benchmarks.proto2.GoogleMessage2") { - RegisterBenchmarksForType(dataset); - } else if (dataset.message_name() == - "benchmarks.google_message3.GoogleMessage3") { - RegisterBenchmarksForType - (dataset); - } else if (dataset.message_name() == - "benchmarks.google_message4.GoogleMessage4") { - RegisterBenchmarksForType - (dataset); - } else { - std::cerr << "Unknown message type: " << dataset.message_name(); - exit(1); - } -} - -int main(int argc, char *argv[]) { - ::benchmark::Initialize(&argc, argv); - if (argc == 1) { - std::cerr << "Usage: ./cpp-benchmark " << std::endl; - std::cerr << "input data is in the format of \"benchmarks.proto\"" - << std::endl; - return 1; - } else { - for (int i = 1; i < argc; i++) { - RegisterBenchmarks(ReadFile(argv[i])); - } - } - - ::benchmark::RunSpecifiedBenchmarks(); -} diff --git a/benchmarks/datasets/BUILD.bazel b/benchmarks/datasets/BUILD.bazel deleted file mode 100644 index d3d8cdf027..0000000000 --- a/benchmarks/datasets/BUILD.bazel +++ /dev/null @@ -1,122 +0,0 @@ -load("@rules_cc//cc:defs.bzl", "cc_library") -load("@rules_java//java:defs.bzl", "java_library") -load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix") -load("@rules_proto//proto:defs.bzl", "proto_library") - -filegroup( - name = "datasets", - srcs = [ - "//benchmarks/datasets/google_message1/proto2:datasets", - "//benchmarks/datasets/google_message1/proto3:datasets", - "//benchmarks/datasets/google_message2:datasets", - "//benchmarks/datasets/google_message3:datasets", - "//benchmarks/datasets/google_message4:datasets", - ], - visibility = [ - "//benchmarks:__subpackages__", - "//conformance:__subpackages__", - ], -) - -filegroup( - name = "proto3_datasets", - srcs = [ - "//benchmarks/datasets/google_message1/proto2:proto3_datasets", - "//benchmarks/datasets/google_message1/proto3:datasets", - "//benchmarks/datasets/google_message2:proto3_datasets", - ], - visibility = [ - "//benchmarks:__subpackages__", - "//conformance:__subpackages__", - "//csharp:__pkg__", - ], -) - -proto_library( - name = "protos", - visibility = [ - "//benchmarks:__subpackages__", - ], - deps = [ - "//benchmarks/datasets/google_message1/proto2:benchmark_message1_proto2_proto", - "//benchmarks/datasets/google_message1/proto3:benchmark_message1_proto3_proto", - "//benchmarks/datasets/google_message2:benchmark_message2_proto", - "//benchmarks/datasets/google_message3:benchmark_message3_proto", - "//benchmarks/datasets/google_message4:benchmark_message4_proto", - ], -) - -cc_library( - name = "cc_protos", - visibility = [ - "//benchmarks:__subpackages__", - ], - deps = [ - "//benchmarks/datasets/google_message1/proto2:benchmark_message1_proto2_cc_proto", - "//benchmarks/datasets/google_message1/proto3:benchmark_message1_proto3_cc_proto", - "//benchmarks/datasets/google_message2:benchmark_message2_cc_proto", - "//benchmarks/datasets/google_message3:benchmark_message3_cc_proto", - "//benchmarks/datasets/google_message4:benchmark_message4_cc_proto", - ], -) - -java_library( - name = "java_protos", - visibility = [ - "//benchmarks:__subpackages__", - ], - exports = [ - "//benchmarks/datasets/google_message1/proto2:benchmark_message1_proto2_java_proto", - "//benchmarks/datasets/google_message1/proto3:benchmark_message1_proto3_java_proto", - "//benchmarks/datasets/google_message2:benchmark_message2_java_proto", - "//benchmarks/datasets/google_message3:benchmark_message3_java_proto", - "//benchmarks/datasets/google_message4:benchmark_message4_java_proto", - ], -) - -py_library( - name = "py_protos", - visibility = [ - "//benchmarks:__subpackages__", - ], - deps = [ - "//benchmarks/datasets/google_message1/proto2:benchmark_message1_proto2_py_proto", - "//benchmarks/datasets/google_message1/proto3:benchmark_message1_proto3_py_proto", - "//benchmarks/datasets/google_message2:benchmark_message2_py_proto", - "//benchmarks/datasets/google_message3:benchmark_message3_py_proto", - "//benchmarks/datasets/google_message4:benchmark_message4_py_proto", - ], -) - -filegroup( - name = "php_protos", - srcs = [ - "//benchmarks/datasets/google_message1/proto2:benchmark_message1_proto2_php_proto", - "//benchmarks/datasets/google_message1/proto3:benchmark_message1_proto3_php_proto", - "//benchmarks/datasets/google_message2:benchmark_message2_php_proto", - ], - visibility = [ - "//benchmarks:__subpackages__", - ], -) - -filegroup( - name = "csharp_protos", - srcs = [ - "//benchmarks/datasets/google_message1/proto2:benchmark_message1_proto2_csharp_proto", - "//benchmarks/datasets/google_message1/proto3:benchmark_message1_proto3_csharp_proto", - "//benchmarks/datasets/google_message2:benchmark_message2_csharp_proto", - "//benchmarks/datasets/google_message3:benchmark_message3_csharp_proto", - "//benchmarks/datasets/google_message4:benchmark_message4_csharp_proto", - ], - visibility = [ - "//benchmarks:__subpackages__", - ], -) - -pkg_files( - name = "dist_files", - srcs = ["BUILD.bazel"], - strip_prefix = strip_prefix.from_root(""), - visibility = ["//benchmarks:__pkg__"], -) diff --git a/benchmarks/datasets/google_message1/proto2/BUILD.bazel b/benchmarks/datasets/google_message1/proto2/BUILD.bazel deleted file mode 100644 index 0bde1e8e28..0000000000 --- a/benchmarks/datasets/google_message1/proto2/BUILD.bazel +++ /dev/null @@ -1,92 +0,0 @@ -load("@rules_cc//cc:defs.bzl", "cc_proto_library") -load("@rules_java//java:defs.bzl", "java_proto_library") -load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix") -load("@rules_proto//proto:defs.bzl", "proto_library") -load("//:protobuf.bzl", "internal_csharp_proto_library", "internal_py_proto_library") -load("//benchmarks/util:compatibility.bzl", "php_proto3_from_proto2_library", "proto3_from_proto2_data") - -filegroup( - name = "datasets", - srcs = [ - "dataset.google_message1_proto2.pb", - ], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -proto3_from_proto2_data( - name = "proto3_datasets", - srcs = [ - "dataset.google_message1_proto2.pb", - ], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -proto_library( - name = "benchmark_message1_proto2_proto", - srcs = [ - "benchmark_message1_proto2.proto", - ], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -cc_proto_library( - name = "benchmark_message1_proto2_cc_proto", - visibility = [ - "//benchmarks/datasets:__pkg__", - ], - deps = [ - "benchmark_message1_proto2_proto", - ], -) - -internal_csharp_proto_library( - name = "benchmark_message1_proto2_csharp_proto", - srcs = ["benchmark_message1_proto2.proto"], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -java_proto_library( - name = "benchmark_message1_proto2_java_proto", - visibility = [ - "//benchmarks/datasets:__pkg__", - ], - deps = [ - "benchmark_message1_proto2_proto", - ], -) - -php_proto3_from_proto2_library( - name = "benchmark_message1_proto2_php_proto", - src = "benchmark_message1_proto2.proto", - outs = [ - "Benchmarks/Proto2/GoogleMessage1.php", - "Benchmarks/Proto2/GoogleMessage1SubMessage.php", - "GPBMetadata/BenchmarkMessage1Proto2.php", - ], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -internal_py_proto_library( - name = "benchmark_message1_proto2_py_proto", - srcs = ["benchmark_message1_proto2.proto"], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -pkg_files( - name = "dist_files", - srcs = glob(["*"]), - strip_prefix = strip_prefix.from_root(""), - visibility = ["//benchmarks:__pkg__"], -) diff --git a/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.proto b/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.proto deleted file mode 100644 index e404b9fe1b..0000000000 --- a/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.proto +++ /dev/null @@ -1,108 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Benchmark messages for proto2. - -syntax = "proto2"; - -package benchmarks.proto2; -option java_package = "com.google.protobuf.benchmarks"; - -// This is the default, but we specify it here explicitly. -option optimize_for = SPEED; - -option cc_enable_arenas = true; - -message GoogleMessage1 { - required string field1 = 1; - optional string field9 = 9; - optional string field18 = 18; - optional bool field80 = 80 [default = false]; - optional bool field81 = 81 [default = true]; - required int32 field2 = 2; - required int32 field3 = 3; - optional int32 field280 = 280; - optional int32 field6 = 6 [default = 0]; - optional int64 field22 = 22; - optional string field4 = 4; - repeated fixed64 field5 = 5; - optional bool field59 = 59 [default = false]; - optional string field7 = 7; - optional int32 field16 = 16; - optional int32 field130 = 130 [default = 0]; - optional bool field12 = 12 [default = true]; - optional bool field17 = 17 [default = true]; - optional bool field13 = 13 [default = true]; - optional bool field14 = 14 [default = true]; - optional int32 field104 = 104 [default = 0]; - optional int32 field100 = 100 [default = 0]; - optional int32 field101 = 101 [default = 0]; - optional string field102 = 102; - optional string field103 = 103; - optional int32 field29 = 29 [default = 0]; - optional bool field30 = 30 [default = false]; - optional int32 field60 = 60 [default = -1]; - optional int32 field271 = 271 [default = -1]; - optional int32 field272 = 272 [default = -1]; - optional int32 field150 = 150; - optional int32 field23 = 23 [default = 0]; - optional bool field24 = 24 [default = false]; - optional int32 field25 = 25 [default = 0]; - optional GoogleMessage1SubMessage field15 = 15; - optional bool field78 = 78; - optional int32 field67 = 67 [default = 0]; - optional int32 field68 = 68; - optional int32 field128 = 128 [default = 0]; - optional string field129 = 129 [default = "xxxxxxxxxxxxxxxxxxxxx"]; - optional int32 field131 = 131 [default = 0]; -} - -message GoogleMessage1SubMessage { - optional int32 field1 = 1 [default = 0]; - optional int32 field2 = 2 [default = 0]; - optional int32 field3 = 3 [default = 0]; - optional string field15 = 15; - optional bool field12 = 12 [default = true]; - optional int64 field13 = 13; - optional int64 field14 = 14; - optional int32 field16 = 16; - optional int32 field19 = 19 [default = 2]; - optional bool field20 = 20 [default = true]; - optional bool field28 = 28 [default = true]; - optional fixed64 field21 = 21; - optional int32 field22 = 22; - optional bool field23 = 23 [default = false]; - optional bool field206 = 206 [default = false]; - optional fixed32 field203 = 203; - optional int32 field204 = 204; - optional string field205 = 205; - optional uint64 field207 = 207; - optional uint64 field300 = 300; -} diff --git a/benchmarks/datasets/google_message1/proto2/dataset.google_message1_proto2.pb b/benchmarks/datasets/google_message1/proto2/dataset.google_message1_proto2.pb deleted file mode 100644 index f6fe7848cb889b65fb2c9465780c2e82b398639b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmd-QOV7_w&qu8dj{HQ>|{A;GUn69Is(pqL3P_P+T4FX`ks_p6DLyqplTDYO0}D9&cq* zT^E(Wn88rMSQW`3DWFp2tYmK%5NQ(YW0Y)DTW4e)6B6bYUmh3j5Sfw*;%sf2nN*`y>=5MalvG+)6lk2Tk*(vmk}>4JGsitCF7*wJYC9MiI~W-z ZF>+Pg29~F#)+y&z&tU18n7DvV9suhNTo3>N diff --git a/benchmarks/datasets/google_message1/proto3/BUILD.bazel b/benchmarks/datasets/google_message1/proto3/BUILD.bazel deleted file mode 100644 index 37cbf09af5..0000000000 --- a/benchmarks/datasets/google_message1/proto3/BUILD.bazel +++ /dev/null @@ -1,81 +0,0 @@ -load("@rules_cc//cc:defs.bzl", "cc_proto_library") -load("@rules_java//java:defs.bzl", "java_proto_library") -load("@rules_proto//proto:defs.bzl", "proto_library") -load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix") -load("//:protobuf.bzl", "internal_csharp_proto_library", "internal_php_proto_library", "internal_py_proto_library") - -filegroup( - name = "datasets", - srcs = [ - "dataset.google_message1_proto3.pb", - ], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -proto_library( - name = "benchmark_message1_proto3_proto", - srcs = [ - "benchmark_message1_proto3.proto", - ], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -cc_proto_library( - name = "benchmark_message1_proto3_cc_proto", - visibility = [ - "//benchmarks/datasets:__pkg__", - ], - deps = [ - "benchmark_message1_proto3_proto", - ], -) - -internal_csharp_proto_library( - name = "benchmark_message1_proto3_csharp_proto", - srcs = ["benchmark_message1_proto3.proto"], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -java_proto_library( - name = "benchmark_message1_proto3_java_proto", - visibility = [ - "//benchmarks/datasets:__pkg__", - ], - deps = [ - "benchmark_message1_proto3_proto", - ], -) - -internal_php_proto_library( - name = "benchmark_message1_proto3_php_proto", - srcs = ["benchmark_message1_proto3.proto"], - outs = [ - "Benchmarks/Proto3/GoogleMessage1.php", - "Benchmarks/Proto3/GoogleMessage1SubMessage.php", - "GPBMetadata/BenchmarkMessage1Proto3.php", - ], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -internal_py_proto_library( - name = "benchmark_message1_proto3_py_proto", - srcs = ["benchmark_message1_proto3.proto"], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -pkg_files( - name = "dist_files", - srcs = glob(["*"]), - strip_prefix = strip_prefix.from_root(""), - visibility = ["//benchmarks:__pkg__"], -) diff --git a/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.proto b/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.proto deleted file mode 100644 index 8aee2f6728..0000000000 --- a/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.proto +++ /dev/null @@ -1,108 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Benchmark messages for proto3. - -syntax = "proto3"; - -package benchmarks.proto3; -option java_package = "com.google.protobuf.benchmarks"; - -// This is the default, but we specify it here explicitly. -option optimize_for = SPEED; - -option cc_enable_arenas = true; - -message GoogleMessage1 { - string field1 = 1; - string field9 = 9; - string field18 = 18; - bool field80 = 80; - bool field81 = 81; - int32 field2 = 2; - int32 field3 = 3; - int32 field280 = 280; - int32 field6 = 6; - int64 field22 = 22; - string field4 = 4; - repeated fixed64 field5 = 5; - bool field59 = 59; - string field7 = 7; - int32 field16 = 16; - int32 field130 = 130; - bool field12 = 12; - bool field17 = 17; - bool field13 = 13; - bool field14 = 14; - int32 field104 = 104; - int32 field100 = 100; - int32 field101 = 101; - string field102 = 102; - string field103 = 103; - int32 field29 = 29; - bool field30 = 30; - int32 field60 = 60; - int32 field271 = 271; - int32 field272 = 272; - int32 field150 = 150; - int32 field23 = 23; - bool field24 = 24; - int32 field25 = 25; - GoogleMessage1SubMessage field15 = 15; - bool field78 = 78; - int32 field67 = 67; - int32 field68 = 68; - int32 field128 = 128; - string field129 = 129; - int32 field131 = 131; -} - -message GoogleMessage1SubMessage { - int32 field1 = 1; - int32 field2 = 2; - int32 field3 = 3; - string field15 = 15; - bool field12 = 12; - int64 field13 = 13; - int64 field14 = 14; - int32 field16 = 16; - int32 field19 = 19; - bool field20 = 20; - bool field28 = 28; - fixed64 field21 = 21; - int32 field22 = 22; - bool field23 = 23; - bool field206 = 206; - fixed32 field203 = 203; - int32 field204 = 204; - string field205 = 205; - uint64 field207 = 207; - uint64 field300 = 300; -} diff --git a/benchmarks/datasets/google_message1/proto3/dataset.google_message1_proto3.pb b/benchmarks/datasets/google_message1/proto3/dataset.google_message1_proto3.pb deleted file mode 100644 index 4955bed31b5aee2a257a4979edd3c1b6291b335f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmd-QOV7_w&qu8dj{HQ>|{A;GUn69Is(pqL3P_P+T4FX`ks_p6DLyqplTDYO0}D9&cq* zT^E(Wn88rMSQW`3DWFp2tYmK%5NQ(YW0Y)DTW4e)6B6bYUmh3j5Sfw*;%sf2nN*`y>=5MalvG+)6lk2Tk*(vmk}>4JGsitCF7*wJYC9MiI~W-z ZF>+Pg29~F#)+y&z&tU18n7DvV9sunQToM2P diff --git a/benchmarks/datasets/google_message2/BUILD.bazel b/benchmarks/datasets/google_message2/BUILD.bazel deleted file mode 100644 index d4e52d4037..0000000000 --- a/benchmarks/datasets/google_message2/BUILD.bazel +++ /dev/null @@ -1,92 +0,0 @@ -load("@rules_cc//cc:defs.bzl", "cc_proto_library") -load("@rules_java//java:defs.bzl", "java_proto_library") -load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix") -load("@rules_proto//proto:defs.bzl", "proto_library") -load("//:protobuf.bzl", "internal_csharp_proto_library", "internal_py_proto_library") -load("//benchmarks/util:compatibility.bzl", "php_proto3_from_proto2_library", "proto3_from_proto2_data") - -filegroup( - name = "datasets", - srcs = [ - "dataset.google_message2.pb", - ], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -proto3_from_proto2_data( - name = "proto3_datasets", - srcs = [ - "dataset.google_message2.pb", - ], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -proto_library( - name = "benchmark_message2_proto", - srcs = [ - "benchmark_message2.proto", - ], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -cc_proto_library( - name = "benchmark_message2_cc_proto", - visibility = [ - "//benchmarks/datasets:__pkg__", - ], - deps = [ - "benchmark_message2_proto", - ], -) - -internal_csharp_proto_library( - name = "benchmark_message2_csharp_proto", - srcs = ["benchmark_message2.proto"], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -java_proto_library( - name = "benchmark_message2_java_proto", - visibility = [ - "//benchmarks/datasets:__pkg__", - ], - deps = [ - "benchmark_message2_proto", - ], -) - -php_proto3_from_proto2_library( - name = "benchmark_message2_php_proto", - src = "benchmark_message2.proto", - outs = [ - "Benchmarks/Proto2/GoogleMessage2.php", - "Benchmarks/Proto2/GoogleMessage2GroupedMessage.php", - "GPBMetadata/BenchmarkMessage2.php", - ], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -internal_py_proto_library( - name = "benchmark_message2_py_proto", - srcs = ["benchmark_message2.proto"], - visibility = [ - "//benchmarks/datasets:__pkg__", - ], -) - -pkg_files( - name = "dist_files", - srcs = glob(["*"]), - strip_prefix = strip_prefix.from_root(""), - visibility = ["//benchmarks:__pkg__"], -) diff --git a/benchmarks/datasets/google_message2/benchmark_message2.proto b/benchmarks/datasets/google_message2/benchmark_message2.proto deleted file mode 100644 index 500c5d699f..0000000000 --- a/benchmarks/datasets/google_message2/benchmark_message2.proto +++ /dev/null @@ -1,108 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// LINT: ALLOW_GROUPS - -// Benchmark messages for proto2. - -syntax = "proto2"; - -package benchmarks.proto2; -option java_package = "com.google.protobuf.benchmarks"; - -// This is the default, but we specify it here explicitly. -option optimize_for = SPEED; - -option cc_enable_arenas = true; - -message GoogleMessage2 { - optional string field1 = 1; - optional int64 field3 = 3; - optional int64 field4 = 4; - optional int64 field30 = 30; - optional bool field75 = 75 [default = false]; - optional string field6 = 6; - optional bytes field2 = 2; - optional int32 field21 = 21 [default = 0]; - optional int32 field71 = 71; - optional float field25 = 25; - optional int32 field109 = 109 [default = 0]; - optional int32 field210 = 210 [default = 0]; - optional int32 field211 = 211 [default = 0]; - optional int32 field212 = 212 [default = 0]; - optional int32 field213 = 213 [default = 0]; - optional int32 field216 = 216 [default = 0]; - optional int32 field217 = 217 [default = 0]; - optional int32 field218 = 218 [default = 0]; - optional int32 field220 = 220 [default = 0]; - optional int32 field221 = 221 [default = 0]; - optional float field222 = 222 [default = 0.0]; - optional int32 field63 = 63; - - repeated group Group1 = 10 { - required float field11 = 11; - optional float field26 = 26; - optional string field12 = 12; - optional string field13 = 13; - repeated string field14 = 14; - required uint64 field15 = 15; - optional int32 field5 = 5; - optional string field27 = 27; - optional int32 field28 = 28; - optional string field29 = 29; - optional string field16 = 16; - repeated string field22 = 22; - repeated int32 field73 = 73; - optional int32 field20 = 20 [default = 0]; - optional string field24 = 24; - optional GoogleMessage2GroupedMessage field31 = 31; - } - repeated string field128 = 128; - optional int64 field131 = 131; - repeated string field127 = 127; - optional int32 field129 = 129; - repeated int64 field130 = 130; - optional bool field205 = 205 [default = false]; - optional bool field206 = 206 [default = false]; -} - -message GoogleMessage2GroupedMessage { - optional float field1 = 1; - optional float field2 = 2; - optional float field3 = 3 [default = 0.0]; - optional bool field4 = 4; - optional bool field5 = 5; - optional bool field6 = 6 [default = true]; - optional bool field7 = 7 [default = false]; - optional float field8 = 8; - optional bool field9 = 9; - optional float field10 = 10; - optional int64 field11 = 11; -} diff --git a/benchmarks/datasets/google_message2/dataset.google_message2.pb b/benchmarks/datasets/google_message2/dataset.google_message2.pb deleted file mode 100644 index 3fa0e49e57db704a0f371d2b58a2d5b315acd554..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 84625 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 _Dhvkbcqst!k~IF4a^29wPt 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 inputDataList; - private List inputStreamList; - private List inputStringList; - private List sampleMessageList; - - private BenchmarkMessageType getMessageType() throws IOException { - if (benchmarkDataset.getMessageName().equals("benchmarks.proto3.GoogleMessage1")) { - return BenchmarkMessageType.GOOGLE_MESSAGE1_PROTO3; - } else if (benchmarkDataset.getMessageName().equals("benchmarks.proto2.GoogleMessage1")) { - return BenchmarkMessageType.GOOGLE_MESSAGE1_PROTO2; - } else if (benchmarkDataset.getMessageName().equals("benchmarks.proto2.GoogleMessage2")) { - return BenchmarkMessageType.GOOGLE_MESSAGE2; - } else if (benchmarkDataset.getMessageName(). - equals("benchmarks.google_message3.GoogleMessage3")) { - return BenchmarkMessageType.GOOGLE_MESSAGE3; - } else if (benchmarkDataset.getMessageName(). - equals("benchmarks.google_message4.GoogleMessage4")) { - return BenchmarkMessageType.GOOGLE_MESSAGE4; - } else { - throw new IllegalStateException("Invalid DataFile! There's no testing message named " - + benchmarkDataset.getMessageName()); - } - } - - @BeforeExperiment - void setUp() throws IOException { - if (!dataFile.equals("")) { - RandomAccessFile file = new RandomAccessFile(new File(dataFile), "r"); - inputData = new byte[(int) file.length()]; - file.readFully(inputData); - benchmarkDataset = BenchmarkDataset.parseFrom(inputData); - benchmarkMessageType = getMessageType(); - } else { - inputData = new byte[0]; - benchmarkDataset = BenchmarkDataset.parseFrom(inputData); - benchmarkMessageType = BenchmarkMessageType.GOOGLE_MESSAGE2; - } - defaultMessage = benchmarkMessageType.getDefaultInstance(); - extensions = benchmarkMessageType.getExtensionRegistry(); - inputDataList = new ArrayList(); - inputStreamList = new ArrayList(); - inputStringList = new ArrayList(); - sampleMessageList = new ArrayList(); - - for (int i = 0; i < benchmarkDataset.getPayloadCount(); i++) { - byte[] singleInputData = benchmarkDataset.getPayload(i).toByteArray(); - inputDataList.add(benchmarkDataset.getPayload(i).toByteArray()); - inputStreamList.add(new ByteArrayInputStream( - benchmarkDataset.getPayload(i).toByteArray())); - inputStringList.add(benchmarkDataset.getPayload(i)); - sampleMessageList.add( - defaultMessage.newBuilderForType().mergeFrom(singleInputData, extensions).build()); - } - } - - @SuppressWarnings({"IgnoredPureGetter", "CheckReturnValue"}) - @Benchmark - void serializeToByteArray(int reps) throws IOException { - if (sampleMessageList.size() == 0) { - return; - } - for (int i = 0; i < reps; i++) { - for (int j = 0; j < sampleMessageList.size(); j++) { - sampleMessageList.get(j).toByteArray(); - } - } - } - - @Benchmark - void serializeToMemoryStream(int reps) throws IOException { - if (sampleMessageList.size() == 0) { - return; - } - for (int i = 0; i < reps; i++) { - for (int j = 0; j < sampleMessageList.size(); j++) { - ByteArrayOutputStream output = new ByteArrayOutputStream(); - sampleMessageList.get(j).writeTo(output); - } - } - } - - @Benchmark - void deserializeFromByteArray(int reps) throws IOException { - if (inputDataList.size() == 0) { - return; - } - for (int i = 0; i < reps; i++) { - for (int j = 0; j < inputDataList.size(); j++) { - benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom( - inputDataList.get(j), extensions); - } - } - } - - @Benchmark - void deserializeFromMemoryStream(int reps) throws IOException { - if (inputStreamList.size() == 0) { - return; - } - for (int i = 0; i < reps; i++) { - for (int j = 0; j < inputStreamList.size(); j++) { - benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom( - inputStreamList.get(j), extensions); - inputStreamList.get(j).reset(); - } - } - } -} - - diff --git a/benchmarks/php/BUILD.bazel b/benchmarks/php/BUILD.bazel deleted file mode 100644 index a00f23b970..0000000000 --- a/benchmarks/php/BUILD.bazel +++ /dev/null @@ -1,69 +0,0 @@ -load("//benchmarks:internal.bzl", "internal_benchmark_test") -load("//build_defs:internal_shell.bzl", "inline_sh_binary") -load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix") - -# The benchmark binary which can be run over any dataset. -inline_sh_binary( - name = "php_benchmark", - testonly = 1, - srcs = [ - "PhpBenchmark.php", - "autoload.php", - ], - cmd = """ - php -d include_path=benchmarks:php/src \\ - -d auto_prepend_file=$(rootpath autoload.php) \\ - $(rootpath PhpBenchmark.php) $$@ - """, - deps = [ - "//benchmarks:benchmarks_php_proto", - "//benchmarks/datasets:php_protos", - "//php:source_files", - ], -) - -# A pre-configured binary using the checked in datasets. -internal_benchmark_test( - name = "php", - args = ["--behavior_prefix='php'"], - binary = ":php_benchmark", - datasets = ["//benchmarks/datasets:proto3_datasets"], - env_vars = ["PROTOBUF_PHP_SRCDIR=php/src"], -) - -# The benchmark binary which can be run over any dataset. -inline_sh_binary( - name = "php_c_benchmark", - testonly = 1, - srcs = [ - "PhpBenchmark.php", - "//php:extension", - ], - cmd = """ - php -d include_path=benchmarks:php/src \\ - -dextension=$(rootpath //php:extension) \\ - $(rootpath PhpBenchmark.php) $$@ - """, - deps = [ - "//benchmarks:benchmarks_php_proto", - "//benchmarks/datasets:php_protos", - ], -) - -# A pre-configured binary using the checked in datasets. -internal_benchmark_test( - name = "php_c", - args = ["--behavior_prefix='php_c'"], - binary = ":php_c_benchmark", - datasets = ["//benchmarks/datasets:proto3_datasets"], - env_vars = ["PROTOBUF_PHP_SRCDIR=php/src"], -) - -pkg_files( - name = "dist_files", - srcs = glob(["*.php"]) + [ - "BUILD.bazel", - ], - strip_prefix = strip_prefix.from_root(""), - visibility = ["//benchmarks:__pkg__"], -) diff --git a/benchmarks/php/PhpBenchmark.php b/benchmarks/php/PhpBenchmark.php deleted file mode 100644 index d3db61d248..0000000000 --- a/benchmarks/php/PhpBenchmark.php +++ /dev/null @@ -1,170 +0,0 @@ -getPayload(); - for ($i = $payloads->count() - 1; $i >= 0; $i--) { - (new $args[1]())->mergeFromString($payloads->offsetGet($i)); - } - } - - // $args: array of message - static function serialize(&$args) { - foreach ($args as &$temp_message) { - $temp_message->serializeToString(); - } - } -} - -class Benchmark -{ - private $benchmark_name; - private $args; - private $benchmark_time; - private $total_bytes; - private $coefficient; - - public function __construct($benchmark_name, $args, $total_bytes, - $benchmark_time = 5.0) { - $this->args = $args; - $this->benchmark_name = $benchmark_name; - $this->benchmark_time = $benchmark_time; - $this->total_bytes = $total_bytes; - $this->coefficient = pow (10, 0) / pow(2, 20); - } - - public function runBenchmark() { - $t = $this->runBenchmarkWithTimes(1); - $times = ceil($this->benchmark_time / $t); - return $this->total_bytes * $times / - ($times == 1 ? $t : $this->runBenchmarkWithTimes($times)) * - $this->coefficient; - } - - private function runBenchmarkWithTimes($times) { - $st = microtime(true); - for ($i = 0; $i < $times; $i++) { - call_user_func_array($this->benchmark_name, array(&$this->args)); - } - $en = microtime(true); - return $en - $st; - } -} - -function getMessageName(&$dataset) { - switch ($dataset->getMessageName()) { - case "benchmarks.proto3.GoogleMessage1": - return "\Benchmarks\Proto3\GoogleMessage1"; - case "benchmarks.proto2.GoogleMessage1": - return "\Benchmarks\Proto2\GoogleMessage1"; - case "benchmarks.proto2.GoogleMessage2": - return "\Benchmarks\Proto2\GoogleMessage2"; - case "benchmarks.google_message3.GoogleMessage3": - return "\Benchmarks\Google_message3\GoogleMessage3"; - case "benchmarks.google_message4.GoogleMessage4": - return "\Benchmarks\Google_message4\GoogleMessage4"; - default: - exit("Message " . $dataset->getMessageName() . " not found !"); - } -} - -function runBenchmark($file, $behavior_prefix) { - $datafile = fopen($file, "r") or die("Unable to open file " . $file); - $bytes = fread($datafile, filesize($file)); - $dataset = new BenchmarkDataset(NULL); - $dataset->mergeFromString($bytes); - $message_name = getMessageName($dataset); - $message_list = array(); - $total_bytes = 0; - $payloads = $dataset->getPayload(); - for ($i = $payloads->count() - 1; $i >= 0; $i--) { - $new_message = new $message_name(); - $new_message->mergeFromString($payloads->offsetGet($i)); - array_push($message_list, $new_message); - $total_bytes += strlen($payloads->offsetGet($i)); - } - - $parse_benchmark = new Benchmark( - "\Google\Protobuf\Benchmark\BenchmarkMethod::parse", - array($dataset, $message_name), $total_bytes); - $serialize_benchmark = new Benchmark( - "\Google\Protobuf\Benchmark\BenchmarkMethod::serialize", - $message_list, $total_bytes); - - return array( - "filename" => $file, - "benchmarks" => array( - $behavior_prefix . "_parse" => $parse_benchmark->runBenchmark(), - $behavior_prefix . "_serailize" => $serialize_benchmark->runBenchmark() - ), - "message_name" => $dataset->getMessageName() - ); -} - -// main -$json_output = false; -$results = array(); -$behavior_prefix = ""; - -foreach ($argv as $index => $arg) { - if ($index == 0) { - continue; - } - if ($arg == "--json") { - $json_output = true; - } else if (strpos($arg, "--behavior_prefix") == 0) { - $behavior_prefix = str_replace("--behavior_prefix=", "", $arg); - } -} - -foreach ($argv as $index => $arg) { - if ($index == 0) { - continue; - } - if (substr($arg, 0, 2) == "--") { - continue; - } else { - array_push($results, runBenchmark($arg, $behavior_prefix)); - } -} - -if ($json_output) { - print json_encode($results); -} else { - print "PHP protobuf benchmark result:\n\n"; - foreach ($results as $result) { - printf("result for test data file: %s\n", $result["filename"]); - foreach ($result["benchmarks"] as $benchmark => $throughput) { - printf(" Throughput for benchmark %s: %.2f MB/s\n", - $benchmark, $throughput); - } - } -} - -?> diff --git a/benchmarks/php/autoload.php b/benchmarks/php/autoload.php deleted file mode 100644 index 52a8741f80..0000000000 --- a/benchmarks/php/autoload.php +++ /dev/null @@ -1,25 +0,0 @@ - - -#include "benchmarks.pb.h" -#include "benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.h" -#include "benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.h" -#include "benchmarks/datasets/google_message2/benchmark_message2.pb.h" -#include "benchmarks/datasets/google_message3/benchmark_message3.pb.h" -#include "benchmarks/datasets/google_message4/benchmark_message4.pb.h" - -static struct PyModuleDef _module = {PyModuleDef_HEAD_INIT, - "libbenchmark_messages", - "Benchmark messages Python module", - -1, - NULL, - NULL, - NULL, - NULL, - NULL}; - -extern "C" { -PyMODINIT_FUNC PyInit_libbenchmark_messages() { - benchmarks::BenchmarkDataset().descriptor(); - benchmarks::proto3::GoogleMessage1().descriptor(); - benchmarks::proto2::GoogleMessage1().descriptor(); - benchmarks::proto2::GoogleMessage2().descriptor(); - benchmarks::google_message3::GoogleMessage3().descriptor(); - benchmarks::google_message4::GoogleMessage4().descriptor(); - - return PyModule_Create(&_module); -} -} diff --git a/benchmarks/util/BUILD.bazel b/benchmarks/util/BUILD.bazel deleted file mode 100644 index 256862e253..0000000000 --- a/benchmarks/util/BUILD.bazel +++ /dev/null @@ -1,50 +0,0 @@ -load("@rules_cc//cc:defs.bzl", "cc_binary") -load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix") -load("@rules_python//python:defs.bzl", "py_binary") - -package(default_visibility = ["//benchmarks:__subpackages__"]) - -cc_binary( - name = "protoc-gen-proto2_to_proto3", - srcs = [ - "protoc-gen-proto2_to_proto3.cc", - "schema_proto2_to_proto3_util.h", - ], - visibility = ["//benchmarks:__subpackages__"], - deps = [ - "//:protobuf", - "//benchmarks:benchmarks_cc_proto", - "//src/google/protobuf/compiler:code_generator", - ], -) - -cc_binary( - name = "proto3_data_stripper", - srcs = [ - "data_proto2_to_proto3_util.h", - "proto3_data_stripper.cc", - ], - deps = [ - "//:protobuf", - "//benchmarks:benchmarks_cc_proto", - "//benchmarks/datasets:cc_protos", - ], -) - -py_binary( - name = "result_parser", - srcs = ["result_parser.py"], - deps = [ - "//benchmarks:benchmarks_py_proto", - ], -) - -################################################################################ -# Distribution files -################################################################################ - -pkg_files( - name = "dist_files", - srcs = glob(["*"]), - strip_prefix = strip_prefix.from_root(""), -) diff --git a/benchmarks/util/__init__.py b/benchmarks/util/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/benchmarks/util/big_query_utils.py b/benchmarks/util/big_query_utils.py deleted file mode 100755 index aea55bbd89..0000000000 --- a/benchmarks/util/big_query_utils.py +++ /dev/null @@ -1,189 +0,0 @@ -#!/usr/bin/env python2.7 - -from __future__ import print_function -import argparse -import json -import uuid -import httplib2 - -from apiclient import discovery -from apiclient.errors import HttpError -from oauth2client.client import GoogleCredentials - -# 30 days in milliseconds -_EXPIRATION_MS = 30 * 24 * 60 * 60 * 1000 -NUM_RETRIES = 3 - - -def create_big_query(): - """Authenticates with cloud platform and gets a BiqQuery service object - """ - creds = GoogleCredentials.get_application_default() - return discovery.build( - 'bigquery', 'v2', credentials=creds, cache_discovery=False) - - -def create_dataset(biq_query, project_id, dataset_id): - is_success = True - body = { - 'datasetReference': { - 'projectId': project_id, - 'datasetId': dataset_id - } - } - - try: - dataset_req = biq_query.datasets().insert( - projectId=project_id, body=body) - dataset_req.execute(num_retries=NUM_RETRIES) - except HttpError as http_error: - if http_error.resp.status == 409: - print('Warning: The dataset %s already exists' % dataset_id) - else: - # Note: For more debugging info, print "http_error.content" - print('Error in creating dataset: %s. Err: %s' % (dataset_id, - http_error)) - is_success = False - return is_success - - -def create_table(big_query, project_id, dataset_id, table_id, table_schema, - description): - fields = [{ - 'name': field_name, - 'type': field_type, - 'description': field_description - } for (field_name, field_type, field_description) in table_schema] - return create_table2(big_query, project_id, dataset_id, table_id, fields, - description) - - -def create_partitioned_table(big_query, - project_id, - dataset_id, - table_id, - table_schema, - description, - partition_type='DAY', - expiration_ms=_EXPIRATION_MS): - """Creates a partitioned table. By default, a date-paritioned table is created with - each partition lasting 30 days after it was last modified. - """ - fields = [{ - 'name': field_name, - 'type': field_type, - 'description': field_description - } for (field_name, field_type, field_description) in table_schema] - return create_table2(big_query, project_id, dataset_id, table_id, fields, - description, partition_type, expiration_ms) - - -def create_table2(big_query, - project_id, - dataset_id, - table_id, - fields_schema, - description, - partition_type=None, - expiration_ms=None): - is_success = True - - body = { - 'description': description, - 'schema': { - 'fields': fields_schema - }, - 'tableReference': { - 'datasetId': dataset_id, - 'projectId': project_id, - 'tableId': table_id - } - } - - if partition_type and expiration_ms: - body["timePartitioning"] = { - "type": partition_type, - "expirationMs": expiration_ms - } - - try: - table_req = big_query.tables().insert( - projectId=project_id, datasetId=dataset_id, body=body) - res = table_req.execute(num_retries=NUM_RETRIES) - print('Successfully created %s "%s"' % (res['kind'], res['id'])) - except HttpError as http_error: - if http_error.resp.status == 409: - print('Warning: Table %s already exists' % table_id) - else: - print('Error in creating table: %s. Err: %s' % (table_id, - http_error)) - is_success = False - return is_success - - -def patch_table(big_query, project_id, dataset_id, table_id, fields_schema): - is_success = True - - body = { - 'schema': { - 'fields': fields_schema - }, - 'tableReference': { - 'datasetId': dataset_id, - 'projectId': project_id, - 'tableId': table_id - } - } - - try: - table_req = big_query.tables().patch( - projectId=project_id, - datasetId=dataset_id, - tableId=table_id, - body=body) - res = table_req.execute(num_retries=NUM_RETRIES) - print('Successfully patched %s "%s"' % (res['kind'], res['id'])) - except HttpError as http_error: - print('Error in creating table: %s. Err: %s' % (table_id, http_error)) - is_success = False - return is_success - - -def insert_rows(big_query, project_id, dataset_id, table_id, rows_list): - is_success = True - body = {'rows': rows_list} - try: - insert_req = big_query.tabledata().insertAll( - projectId=project_id, - datasetId=dataset_id, - tableId=table_id, - body=body) - res = insert_req.execute(num_retries=NUM_RETRIES) - if res.get('insertErrors', None): - print('Error inserting rows! Response: %s' % res) - is_success = False - except HttpError as http_error: - print('Error inserting rows to the table %s' % table_id) - is_success = False - - return is_success - - -def sync_query_job(big_query, project_id, query, timeout=5000): - query_data = {'query': query, 'timeoutMs': timeout} - query_job = None - try: - query_job = big_query.jobs().query( - projectId=project_id, - body=query_data).execute(num_retries=NUM_RETRIES) - except HttpError as http_error: - print('Query execute job failed with error: %s' % http_error) - print(http_error.content) - return query_job - - - # List of (column name, column type, description) tuples -def make_row(unique_row_id, row_values_dict): - """row_values_dict is a dictionary of column name and column value. - """ - return {'insertId': unique_row_id, 'json': row_values_dict} diff --git a/benchmarks/util/compatibility.bzl b/benchmarks/util/compatibility.bzl deleted file mode 100644 index 840fd45b23..0000000000 --- a/benchmarks/util/compatibility.bzl +++ /dev/null @@ -1,105 +0,0 @@ -"""Starlark definitions for converting proto2 to proto3. - -PLEASE DO NOT DEPEND ON THE CONTENTS OF THIS FILE, IT IS UNSTABLE. -""" - -load("//:protobuf.bzl", "internal_php_proto_library") - -def proto3_from_proto2_data( - name, - srcs, - **kwargs): - """Transforms proto2 binary data into a proto3-compatible format, - - Args: - name: the name of the target representing the generated proto files. - srcs: the source binary protobuf data files. - **kwargs: standard arguments to forward on - """ - outs = [] - out_files = [] - src_files = [] - for src in srcs: - outs.append("proto3/" + src) - out_files.append("$(RULEDIR)/proto3/" + src) - src_files.append("$(rootpath %s)" % src) - - native.genrule( - name = name + "_genrule", - srcs = srcs, - exec_tools = [ - "//benchmarks/util:proto3_data_stripper", - ], - outs = outs, - cmd = "$(execpath //benchmarks/util:proto3_data_stripper) %s %s" % ( - " ".join(src_files), - " ".join(out_files), - ), - ) - - native.filegroup( - name = name, - srcs = outs, - **kwargs - ) - -def _proto3_from_proto2_library( - name, - srcs, - **kwargs): - """Create a proto3 library from a proto2 source. - - Args: - name: the name of the target representing the generated proto files. - srcs: the source proto2 files. Note: these must be raw sources. - **kwargs: standard arguments to forward on - """ - outs = [] - src_files = [] - for src in srcs: - outs.append(src + "3") - src_files.append("$(rootpath %s)" % src) - - native.genrule( - name = name, - srcs = srcs, - exec_tools = [ - "//:protoc", - "//benchmarks/util:protoc-gen-proto2_to_proto3", - ], - outs = outs, - cmd = """ - $(execpath //:protoc) \ - --plugin=$(execpath //benchmarks/util:protoc-gen-proto2_to_proto3) \ - --proto_path=. \ - --proto_path=$(GENDIR) \ - --proto2_to_proto3_out=$(GENDIR) \ - %s - """ % (" ".join(src_files)), - **kwargs - ) - -def php_proto3_from_proto2_library( - name, - src, - outs = [], - **kwargs): - """Create a proto3 php library from a proto2 source. - - Args: - name: the name of the target representing the generated proto files. - src: the source proto2 file. - outs: the expected php outputs. - **kwargs: standard arguments to forward on - """ - _proto3_from_proto2_library( - name = name + "_genrule", - srcs = [src], - ) - - internal_php_proto_library( - name = name, - srcs = [name + "_genrule"], - outs = outs, - **kwargs - ) diff --git a/benchmarks/util/data_proto2_to_proto3_util.h b/benchmarks/util/data_proto2_to_proto3_util.h deleted file mode 100644 index 5eea850900..0000000000 --- a/benchmarks/util/data_proto2_to_proto3_util.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef PROTOBUF_BENCHMARKS_UTIL_DATA_PROTO2_TO_PROTO3_UTIL_H_ -#define PROTOBUF_BENCHMARKS_UTIL_DATA_PROTO2_TO_PROTO3_UTIL_H_ - -#include "google/protobuf/message.h" -#include "google/protobuf/descriptor.h" - -using google::protobuf::FieldDescriptor; -using google::protobuf::Message; -using google::protobuf::Reflection; - -namespace google { -namespace protobuf { -namespace util { - -class DataStripper { - public: - void StripMessage(Message *message) { - std::vector set_fields; - const Reflection* reflection = message->GetReflection(); - reflection->ListFields(*message, &set_fields); - - for (size_t i = 0; i < set_fields.size(); i++) { - const FieldDescriptor* field = set_fields[i]; - if (ShouldBeClear(field)) { - reflection->ClearField(message, field); - continue; - } - if (field->type() == FieldDescriptor::TYPE_MESSAGE) { - if (field->is_repeated()) { - for (int j = 0; j < reflection->FieldSize(*message, field); j++) { - StripMessage(reflection->MutableRepeatedMessage(message, field, j)); - } - } else { - StripMessage(reflection->MutableMessage(message, field)); - } - } - } - - reflection->MutableUnknownFields(message)->Clear(); - } - private: - virtual bool ShouldBeClear(const FieldDescriptor *field) = 0; -}; - -class GogoDataStripper : public DataStripper { - private: - virtual bool ShouldBeClear(const FieldDescriptor *field) { - return field->type() == FieldDescriptor::TYPE_GROUP; - } -}; - -class Proto3DataStripper : public DataStripper { - private: - virtual bool ShouldBeClear(const FieldDescriptor *field) { - return field->type() == FieldDescriptor::TYPE_GROUP || - field->is_extension(); - } -}; - -} // namespace util -} // namespace protobuf -} // namespace google - -#endif // PROTOBUF_BENCHMARKS_UTIL_DATA_PROTO2_TO_PROTO3_UTIL_H_ diff --git a/benchmarks/util/proto3_data_stripper.cc b/benchmarks/util/proto3_data_stripper.cc deleted file mode 100644 index c34745e940..0000000000 --- a/benchmarks/util/proto3_data_stripper.cc +++ /dev/null @@ -1,74 +0,0 @@ -#include - -#include "benchmarks.pb.h" -#include "benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.pb.h" -#include "benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.pb.h" -#include "benchmarks/datasets/google_message2/benchmark_message2.pb.h" -#include "benchmarks/datasets/google_message3/benchmark_message3.pb.h" -#include "benchmarks/datasets/google_message4/benchmark_message4.pb.h" -#include "data_proto2_to_proto3_util.h" - -using google::protobuf::util::Proto3DataStripper; - -std::string ReadFile(const std::string& name) { - std::ifstream file(name.c_str()); - GOOGLE_CHECK(file.is_open()) << "Couldn't find file '" - << name - << "', please make sure you are running this command from the benchmarks" - << " directory.\n"; - return std::string((std::istreambuf_iterator(file)), - std::istreambuf_iterator()); -} - -int main(int argc, char *argv[]) { - if (argc % 2 == 0 || argc == 1) { - std::cerr << "Usage: [input_files] [output_file_names] where " << - "input_files are one to one mapping to output_file_names." << - std::endl; - return 1; - } - - for (int i = argc / 2; i > 0; i--) { - const std::string &input_file = argv[i]; - const std::string &output_file = argv[i + argc / 2]; - - std::cerr << "Generating " << input_file - << " to " << output_file << std::endl; - benchmarks::BenchmarkDataset dataset; - Message* message; - std::string dataset_payload = ReadFile(input_file); - GOOGLE_CHECK(dataset.ParseFromString(dataset_payload)) - << "Can' t parse data file " << input_file; - - if (dataset.message_name() == "benchmarks.proto3.GoogleMessage1") { - message = new benchmarks::proto3::GoogleMessage1; - } else if (dataset.message_name() == "benchmarks.proto2.GoogleMessage1") { - message = new benchmarks::proto2::GoogleMessage1; - } else if (dataset.message_name() == "benchmarks.proto2.GoogleMessage2") { - message = new benchmarks::proto2::GoogleMessage2; - } else if (dataset.message_name() == - "benchmarks.google_message3.GoogleMessage3") { - message = new benchmarks::google_message3::GoogleMessage3; - } else if (dataset.message_name() == - "benchmarks.google_message4.GoogleMessage4") { - message = new benchmarks::google_message4::GoogleMessage4; - } else { - std::cerr << "Unknown message type: " << dataset.message_name(); - exit(1); - } - - for (int i = 0; i < dataset.payload_size(); i++) { - message->ParseFromString(dataset.payload(i)); - Proto3DataStripper stripper; - stripper.StripMessage(message); - dataset.set_payload(i, message->SerializeAsString()); - } - - std::ofstream ofs(output_file); - ofs << dataset.SerializeAsString(); - ofs.close(); - } - - - return 0; -} diff --git a/benchmarks/util/protoc-gen-proto2_to_proto3.cc b/benchmarks/util/protoc-gen-proto2_to_proto3.cc deleted file mode 100644 index cc550ced76..0000000000 --- a/benchmarks/util/protoc-gen-proto2_to_proto3.cc +++ /dev/null @@ -1,118 +0,0 @@ -#include "google/protobuf/compiler/code_generator.h" -#include "google/protobuf/io/zero_copy_stream.h" -#include "google/protobuf/io/printer.h" -#include "google/protobuf/descriptor.h" -#include "google/protobuf/descriptor.pb.h" -#include "schema_proto2_to_proto3_util.h" - -#include "google/protobuf/compiler/plugin.h" - -using google::protobuf::DescriptorPool; -using google::protobuf::FileDescriptor; -using google::protobuf::FileDescriptorProto; -using google::protobuf::io::Printer; -using google::protobuf::util::EnumScrubber; -using google::protobuf::util::ExtensionStripper; -using google::protobuf::util::FieldScrubber; -using google::protobuf::util::ImportScrubber; -using google::protobuf::util::SchemaGroupStripper; - -namespace google { -namespace protobuf { -namespace compiler { - -namespace { - -std::string StripProtoExt(const std::string& filename) { - return filename.substr(0, filename.rfind(".proto")); -} - -DescriptorPool* GetPool() { - static DescriptorPool *pool = new DescriptorPool(); - return pool; -} - -} // namespace - -class Proto2ToProto3Generator final : public CodeGenerator { - public: - bool GenerateAll(const std::vector& files, - const std::string& parameter, GeneratorContext* context, - std::string* error) const { - for (int i = 0; i < files.size(); i++) { - for (auto file : files) { - if (CanGenerate(file)) { - Generate(file, parameter, context, error); - break; - } - } - } - - return true; - } - - bool Generate(const FileDescriptor* file, const std::string& parameter, - GeneratorContext* context, std::string* error) const { - FileDescriptorProto new_file; - file->CopyTo(&new_file); - new_file.set_name(ImportScrubber::ScrubFilename(file->name())); - SchemaGroupStripper::StripFile(file, &new_file); - - EnumScrubber enum_scrubber; - enum_scrubber.ScrubFile(&new_file); - ExtensionStripper::StripFile(&new_file); - FieldScrubber::ScrubFile(&new_file); - ImportScrubber::ScrubFile(&new_file); - new_file.set_syntax("proto3"); - - std::string filename = file->name(); - std::string basename = StripProtoExt(filename); - - std::vector> option_pairs; - ParseGeneratorParameter(parameter, &option_pairs); - - std::unique_ptr output( - context->Open(basename + ".proto3")); - std::string content = GetPool()->BuildFile(new_file)->DebugString(); - Printer printer(output.get(), '$'); - printer.WriteRaw(content.c_str(), content.size()); - - return true; - } - - private: - bool CanGenerate(const FileDescriptor* file) const { - if (GetPool()->FindFileByName( - ImportScrubber::ScrubFilename(file->name())) != nullptr) { - return false; - } - for (int j = 0; j < file->dependency_count(); j++) { - if (GetPool()->FindFileByName(ImportScrubber::ScrubFilename( - file->dependency(j)->name())) == nullptr) { - return false; - } - } - for (int j = 0; j < file->public_dependency_count(); j++) { - if (GetPool()->FindFileByName( - file->public_dependency(j)->name()) == nullptr) { - return false; - } - } - for (int j = 0; j < file->weak_dependency_count(); j++) { - if (GetPool()->FindFileByName( - file->weak_dependency(j)->name()) == nullptr) { - return false; - } - } - return true; - } -}; - -} // namespace compiler -} // namespace protobuf -} // namespace google - -int main(int argc, char* argv[]) { - google::protobuf::compiler::Proto2ToProto3Generator generator; - return google::protobuf::compiler::PluginMain(argc, argv, &generator); -} diff --git a/benchmarks/util/result_parser.py b/benchmarks/util/result_parser.py deleted file mode 100644 index d61b3c0cd7..0000000000 --- a/benchmarks/util/result_parser.py +++ /dev/null @@ -1,352 +0,0 @@ -"""Parses benchmark results into a standardized json output.""" - -import argparse -import json -import re -import os.path -from benchmarks import benchmarks_pb2 -# BEGIN OPENSOURCE -import sys -sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), os.pardir)) -# END OPENSOURCE - -__file_size_map = {} - -def __get_data_size(filename): - if filename[0] != '/': - filename = os.path.dirname(os.path.abspath(__file__)) + "/../" + filename - if filename in __file_size_map: - return __file_size_map[filename] - benchmark_dataset = benchmarks_pb2.BenchmarkDataset() - benchmark_dataset.ParseFromString( - open(filename, "rb").read()) - size = 0 - count = 0 - for payload in benchmark_dataset.payload: - size += len(payload) - count += 1 - __file_size_map[filename] = (size, 1.0 * size / count) - return size, 1.0 * size / count - - -def __extract_file_name(file_name): - name_list = re.split(r"[/\.]", file_name) - short_file_name = "" - for name in name_list: - if name[:14] == "google_message": - short_file_name = name - return short_file_name - - -__results = [] - - -# CPP results example: -# [ -# "benchmarks": [ -# { -# "bytes_per_second": int, -# "cpu_time_ns": double, -# "iterations": int, -# "name: string, -# "real_time_ns: double, -# ... -# }, -# ... -# ], -# ... -# ] -def __parse_cpp_result(filename): - if filename == "": - return - if filename[0] != '/': - filename = os.path.dirname(os.path.abspath(__file__)) + '/' + filename - with open(filename, encoding="utf-8") as f: - results = json.loads(f.read()) - for benchmark in results["benchmarks"]: - data_filename = "".join( - re.split("(_parse_|_serialize)", benchmark["name"])[0]) - behavior = benchmark["name"][len(data_filename) + 1:] - if data_filename[:2] == "BM": - data_filename = data_filename[3:] - __results.append({ - "language": "cpp", - "dataFilename": data_filename, - "behavior": behavior, - "throughput": benchmark["bytes_per_second"] / 2.0 ** 20 - }) - - -# Synthetic benchmark results example: -# [ -# "benchmarks": [ -# { -# "cpu_time_ns": double, -# "iterations": int, -# "name: string, -# "real_time_ns: double, -# ... -# }, -# ... -# ], -# ... -# ] -def __parse_synthetic_result(filename): - if filename == "": - return - if filename[0] != "/": - filename = os.path.dirname(os.path.abspath(__file__)) + "/" + filename - with open(filename, encoding="utf-8") as f: - results = json.loads(f.read()) - for benchmark in results["benchmarks"]: - __results.append({ - "language": "cpp", - "dataFilename": "", - "behavior": "synthetic", - "throughput": 10.0**9 / benchmark["cpu_time_ns"] - }) - - -# Python results example: -# [ -# [ -# { -# "filename": string, -# "benchmarks": { -# behavior: results, -# ... -# }, -# }, -# ... -# ], #pure-python -# ... -# ] -def __parse_python_result(filename): - if filename == "": - return - if filename[0] != '/': - filename = os.path.dirname(os.path.abspath(__file__)) + '/' + filename - with open(filename, encoding="utf-8") as f: - results_list = json.loads(f.read()) - for results in results_list: - for result in results: - _, avg_size = __get_data_size(result["filename"]) - for behavior in result["benchmarks"]: - __results.append({ - "language": "python", - "dataFilename": __extract_file_name(result["filename"]), - "behavior": behavior, - "throughput": result["benchmarks"][behavior] - }) - - -# Java results example: -# [ -# { -# "id": string, -# "instrumentSpec": {...}, -# "measurements": [ -# { -# "weight": float, -# "value": { -# "magnitude": float, -# "unit": string -# }, -# ... -# }, -# ... -# ], -# "run": {...}, -# "scenario": { -# "benchmarkSpec": { -# "methodName": string, -# "parameters": { -# defined parameters in the benchmark: parameters value -# }, -# ... -# }, -# ... -# } -# -# }, -# ... -# ] -def __parse_java_result(filename): - if filename == "": - return - if filename[0] != '/': - filename = os.path.dirname(os.path.abspath(__file__)) + '/' + filename - with open(filename, encoding="utf-8") as f: - results = json.loads(f.read()) - for result in results: - total_weight = 0 - total_value = 0 - for measurement in result["measurements"]: - total_weight += measurement["weight"] - total_value += measurement["value"]["magnitude"] - avg_time = total_value * 1.0 / total_weight - total_size, _ = __get_data_size( - result["scenario"]["benchmarkSpec"]["parameters"]["dataFile"]) - __results.append({ - "language": "java", - "throughput": total_size / avg_time * 1e9 / 2 ** 20, - "behavior": result["scenario"]["benchmarkSpec"]["methodName"], - "dataFilename": __extract_file_name( - result["scenario"]["benchmarkSpec"]["parameters"]["dataFile"]) - }) - - -# Go benchmark results: -# -# goos: linux -# goarch: amd64 -# Benchmark/.././datasets/google_message2/dataset.google_message2.pb/Unmarshal-12 3000 705784 ns/op -# Benchmark/.././datasets/google_message2/dataset.google_message2.pb/Marshal-12 2000 634648 ns/op -# Benchmark/.././datasets/google_message2/dataset.google_message2.pb/Size-12 5000 244174 ns/op -# Benchmark/.././datasets/google_message2/dataset.google_message2.pb/Clone-12 300 4120954 ns/op -# Benchmark/.././datasets/google_message2/dataset.google_message2.pb/Merge-12 300 4108632 ns/op -# PASS -# ok _/usr/local/google/home/yilunchong/mygit/protobuf/benchmarks 124.173s -def __parse_go_result(filename): - if filename == "": - return - if filename[0] != '/': - filename = os.path.dirname(os.path.abspath(__file__)) + '/' + filename - with open(filename, encoding="utf-8") as f: - for line in f: - result_list = re.split(r"[\ \t]+", line) - if result_list[0][:9] != "Benchmark": - continue - first_slash_index = result_list[0].find('/') - last_slash_index = result_list[0].rfind('/') - full_filename = result_list[0][first_slash_index+1:last_slash_index] - total_bytes, _ = __get_data_size(full_filename) - behavior_with_suffix = result_list[0][last_slash_index+1:] - last_dash = behavior_with_suffix.rfind("-") - if last_dash == -1: - behavior = behavior_with_suffix - else: - behavior = behavior_with_suffix[:last_dash] - __results.append({ - "dataFilename": __extract_file_name(full_filename), - "throughput": total_bytes / float(result_list[2]) * 1e9 / 2 ** 20, - "behavior": behavior, - "language": "go" - }) - - -# Self built json results example: -# -# [ -# { -# "filename": string, -# "benchmarks": { -# behavior: results, -# ... -# }, -# }, -# ... -# ] -def __parse_custom_result(filename, language): - if filename == "": - return - if filename[0] != '/': - filename = os.path.dirname(os.path.abspath(__file__)) + '/' + filename - with open(filename, encoding="utf-8") as f: - results = json.loads(f.read()) - for result in results: - _, avg_size = __get_data_size(result["filename"]) - for behavior in result["benchmarks"]: - __results.append({ - "language": language, - "dataFilename": __extract_file_name(result["filename"]), - "behavior": behavior, - "throughput": result["benchmarks"][behavior] - }) - - -def __parse_js_result(filename, language): - return __parse_custom_result(filename, language) - -def __parse_php_result(filename, language): - return __parse_custom_result(filename, language) - - -def get_result_from_file(cpp_file="", - java_file="", - python_file="", - go_file="", - synthetic_file="", - node_file="", - php_c_file="", - php_file=""): - results = {} - if cpp_file != "": - __parse_cpp_result(cpp_file) - if java_file != "": - __parse_java_result(java_file) - if python_file != "": - __parse_python_result(python_file) - if go_file != "": - __parse_go_result(go_file) - if synthetic_file != "": - __parse_synthetic_result(synthetic_file) - if node_file != "": - __parse_js_result(node_file, "node") - if php_file != "": - __parse_php_result(php_file, "php") - if php_c_file != "": - __parse_php_result(php_c_file, "php") - - return __results - - -if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument( - "-cpp", - "--cpp_input_file", - help="The CPP benchmark result file's name", - default="") - parser.add_argument( - "-java", - "--java_input_file", - help="The Java benchmark result file's name", - default="") - parser.add_argument( - "-python", - "--python_input_file", - help="The Python benchmark result file's name", - default="") - parser.add_argument( - "-go", - "--go_input_file", - help="The golang benchmark result file's name", - default="") - parser.add_argument( - "-node", - "--node_input_file", - help="The node.js benchmark result file's name", - default="") - parser.add_argument( - "-php", - "--php_input_file", - help="The pure php benchmark result file's name", - default="") - parser.add_argument( - "-php_c", - "--php_c_input_file", - help="The php with c ext benchmark result file's name", - default="") - args = parser.parse_args() - - results = get_result_from_file( - cpp_file=args.cpp_input_file, - java_file=args.java_input_file, - python_file=args.python_input_file, - go_file=args.go_input_file, - node_file=args.node_input_file, - php_file=args.php_input_file, - php_c_file=args.php_c_input_file, - ) - print(json.dumps(results, indent=2)) diff --git a/benchmarks/util/result_uploader.py b/benchmarks/util/result_uploader.py deleted file mode 100644 index 2a35d9694d..0000000000 --- a/benchmarks/util/result_uploader.py +++ /dev/null @@ -1,107 +0,0 @@ -from __future__ import print_function -from __future__ import absolute_import -import argparse -import os -import re -import copy -import uuid -import calendar -import time -import datetime - -from util import big_query_utils -from util import result_parser - -_PROJECT_ID = 'grpc-testing' -_DATASET = 'protobuf_benchmark_result' -_TABLE = 'opensource_result_v2' -_NOW = "%d%02d%02d" % (datetime.datetime.now().year, - datetime.datetime.now().month, - datetime.datetime.now().day) - -_INITIAL_TIME = calendar.timegm(time.gmtime()) - -def get_metadata(): - build_number = os.getenv('BUILD_NUMBER') - build_url = os.getenv('BUILD_URL') - job_name = os.getenv('JOB_NAME') - git_commit = os.getenv('GIT_COMMIT') - # actual commit is the actual head of PR that is getting tested - git_actual_commit = os.getenv('ghprbActualCommit') - - utc_timestamp = str(calendar.timegm(time.gmtime())) - metadata = {'created': utc_timestamp} - - if build_number: - metadata['buildNumber'] = build_number - if build_url: - metadata['buildUrl'] = build_url - if job_name: - metadata['jobName'] = job_name - if git_commit: - metadata['gitCommit'] = git_commit - if git_actual_commit: - metadata['gitActualCommit'] = git_actual_commit - - return metadata - - -def upload_result(result_list, metadata): - for result in result_list: - new_result = {} - new_result["metric"] = "throughput" - new_result["value"] = result["throughput"] - new_result["unit"] = "MB/s" - new_result["test"] = "protobuf_benchmark" - new_result["product_name"] = "protobuf" - labels_string = "" - for key in result: - labels_string += ",|%s:%s|" % (key, result[key]) - new_result["labels"] = labels_string[1:] - new_result["timestamp"] = _INITIAL_TIME - print(labels_string) - - bq = big_query_utils.create_big_query() - row = big_query_utils.make_row(str(uuid.uuid4()), new_result) - if not big_query_utils.insert_rows(bq, _PROJECT_ID, _DATASET, - _TABLE + "$" + _NOW, - [row]): - print('Error when uploading result', new_result) - - -if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument("-cpp", "--cpp_input_file", - help="The CPP benchmark result file's name", - default="") - parser.add_argument("-java", "--java_input_file", - help="The Java benchmark result file's name", - default="") - parser.add_argument("-python", "--python_input_file", - help="The Python benchmark result file's name", - default="") - parser.add_argument("-go", "--go_input_file", - help="The golang benchmark result file's name", - default="") - parser.add_argument("-node", "--node_input_file", - help="The node.js benchmark result file's name", - default="") - parser.add_argument("-php", "--php_input_file", - help="The pure php benchmark result file's name", - default="") - parser.add_argument("-php_c", "--php_c_input_file", - help="The php with c ext benchmark result file's name", - default="") - args = parser.parse_args() - - metadata = get_metadata() - print("uploading results...") - upload_result(result_parser.get_result_from_file( - cpp_file=args.cpp_input_file, - java_file=args.java_input_file, - python_file=args.python_input_file, - go_file=args.go_input_file, - node_file=args.node_input_file, - php_file=args.php_input_file, - php_c_file=args.php_c_input_file, - ), metadata) diff --git a/benchmarks/util/schema_proto2_to_proto3_util.h b/benchmarks/util/schema_proto2_to_proto3_util.h deleted file mode 100644 index bd6ff26ca4..0000000000 --- a/benchmarks/util/schema_proto2_to_proto3_util.h +++ /dev/null @@ -1,206 +0,0 @@ -#ifndef PROTOBUF_BENCHMARKS_UTIL_SCHEMA_PROTO2_TO_PROTO3_UTIL_H_ -#define PROTOBUF_BENCHMARKS_UTIL_SCHEMA_PROTO2_TO_PROTO3_UTIL_H_ - -#include "google/protobuf/message.h" -#include "google/protobuf/descriptor.h" -#include "google/protobuf/descriptor.pb.h" - -#include -#include - -using google::protobuf::Descriptor; -using google::protobuf::DescriptorProto; -using google::protobuf::FileDescriptorProto; -using google::protobuf::FieldDescriptorProto; -using google::protobuf::Message; -using google::protobuf::EnumValueDescriptorProto; - -namespace google { -namespace protobuf { -namespace util { - -class SchemaGroupStripper { - - public: - static void StripFile(const FileDescriptor* old_file, - FileDescriptorProto *file) { - for (int i = file->mutable_message_type()->size() - 1; i >= 0; i--) { - if (IsMessageSet(old_file->message_type(i))) { - file->mutable_message_type()->DeleteSubrange(i, 1); - continue; - } - StripMessage(old_file->message_type(i), file->mutable_message_type(i)); - } - for (int i = file->mutable_extension()->size() - 1; i >= 0; i--) { - auto field = old_file->extension(i); - if (field->type() == FieldDescriptor::TYPE_GROUP || - IsMessageSet(field->message_type()) || - IsMessageSet(field->containing_type())) { - file->mutable_extension()->DeleteSubrange(i, 1); - } - } - } - - private: - static bool IsMessageSet(const Descriptor *descriptor) { - if (descriptor != nullptr - && descriptor->options().message_set_wire_format()) { - return true; - } - return false; - } - - static void StripMessage(const Descriptor *old_message, - DescriptorProto *new_message) { - for (int i = new_message->mutable_field()->size() - 1; i >= 0; i--) { - if (old_message->field(i)->type() == FieldDescriptor::TYPE_GROUP || - IsMessageSet(old_message->field(i)->message_type())) { - new_message->mutable_field()->DeleteSubrange(i, 1); - } - } - for (int i = new_message->mutable_extension()->size() - 1; i >= 0; i--) { - auto field_type_name = new_message->mutable_extension(i)->type_name(); - if (old_message->extension(i)->type() == FieldDescriptor::TYPE_GROUP || - IsMessageSet(old_message->extension(i)->containing_type()) || - IsMessageSet(old_message->extension(i)->message_type())) { - new_message->mutable_extension()->DeleteSubrange(i, 1); - } - } - for (int i = 0; i < new_message->mutable_nested_type()->size(); i++) { - StripMessage(old_message->nested_type(i), - new_message->mutable_nested_type(i)); - } - } - -}; - -class EnumScrubber { - - public: - EnumScrubber() - : total_added_(0) { - } - - void ScrubFile(FileDescriptorProto *file) { - for (int i = 0; i < file->enum_type_size(); i++) { - ScrubEnum(file->mutable_enum_type(i)); - } - for (int i = 0; i < file->mutable_message_type()->size(); i++) { - ScrubMessage(file->mutable_message_type(i)); - } - } - - private: - void ScrubEnum(EnumDescriptorProto *enum_type) { - if (enum_type->value(0).number() != 0) { - bool has_zero = false; - for (int j = 0; j < enum_type->value().size(); j++) { - if (enum_type->value(j).number() == 0) { - EnumValueDescriptorProto temp_enum_value; - temp_enum_value.CopyFrom(enum_type->value(j)); - enum_type->mutable_value(j)->CopyFrom(enum_type->value(0)); - enum_type->mutable_value(0)->CopyFrom(temp_enum_value); - has_zero = true; - break; - } - } - if (!has_zero) { - enum_type->mutable_value()->Add(); - for (int i = enum_type->mutable_value()->size() - 1; i > 0; i--) { - enum_type->mutable_value(i)->CopyFrom( - *enum_type->mutable_value(i - 1)); - } - enum_type->mutable_value(0)->set_number(0); - enum_type->mutable_value(0)->set_name("ADDED_ZERO_VALUE_" + - std::to_string(total_added_++)); - } - } - - } - - void ScrubMessage(DescriptorProto *message_type) { - for (int i = 0; i < message_type->mutable_enum_type()->size(); i++) { - ScrubEnum(message_type->mutable_enum_type(i)); - } - for (int i = 0; i < message_type->mutable_nested_type()->size(); i++) { - ScrubMessage(message_type->mutable_nested_type(i)); - } - } - - int total_added_; -}; - -class ExtensionStripper { - public: - static void StripFile(FileDescriptorProto *file) { - for (int i = 0; i < file->mutable_message_type()->size(); i++) { - StripMessage(file->mutable_message_type(i)); - } - file->mutable_extension()->Clear(); - } - private: - static void StripMessage(DescriptorProto *message_type) { - message_type->mutable_extension()->Clear(); - message_type->clear_extension_range(); - for (int i = 0; i < message_type->mutable_nested_type()->size(); i++) { - StripMessage(message_type->mutable_nested_type(i)); - } - } -}; - - -class FieldScrubber { - public: - static void ScrubFile(FileDescriptorProto *file) { - for (int i = 0; i < file->mutable_message_type()->size(); i++) { - ScrubMessage(file->mutable_message_type(i)); - } - for (int i = 0; i < file->mutable_extension()->size(); i++) { - file->mutable_extension(i)->clear_default_value(); - if (ShouldClearLabel(file->mutable_extension(i))) { - file->mutable_extension(i)->clear_label(); - } - } - } - private: - static bool ShouldClearLabel(const FieldDescriptorProto *field) { - return field->label() == FieldDescriptorProto::LABEL_REQUIRED; - } - - static void ScrubMessage(DescriptorProto *message_type) { - message_type->mutable_extension()->Clear(); - for (int i = 0; i < message_type->mutable_extension()->size(); i++) { - message_type->mutable_extension(i)->clear_default_value(); - if (ShouldClearLabel(message_type->mutable_extension(i))) { - message_type->mutable_extension(i)->clear_label(); - } - } - for (int i = 0; i < message_type->mutable_field()->size(); i++) { - message_type->mutable_field(i)->clear_default_value(); - if (ShouldClearLabel(message_type->mutable_field(i))) { - message_type->mutable_field(i)->clear_label(); - } - } - for (int i = 0; i < message_type->mutable_nested_type()->size(); i++) { - ScrubMessage(message_type->mutable_nested_type(i)); - } - } -}; - -class ImportScrubber { - public: - static std::string ScrubFilename(const std::string &filename) { - return filename + "3"; - } - static void ScrubFile(FileDescriptorProto *file) { - for (std::string &import : *file->mutable_dependency()) { - import += "3"; - } - } -}; - -} // namespace util -} // namespace protobuf -} // namespace google - -#endif // PROTOBUF_BENCHMARKS_UTIL_SCHEMA_PROTO2_TO_PROTO3_UTIL_H_ From 87f8593fb879f753105ec5638b31717a11179a33 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Fri, 9 Sep 2022 10:44:18 -0700 Subject: [PATCH 2/5] Updating changelog --- CHANGES.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index cd2fbcc42f..929ff134ee 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -12,6 +12,13 @@ * Use table-driven parser for reflection based objects. * Update Map's InternalSwap() to take a pointer to the other Map. * Add ARM-optimized Varint decoding functions. + * Minor optimization for parsing groups + * Declare ReflectiveProtoHook class + * Reduce size of VarintParse code in protocol buffers, by calling the shared routine after handling just one-byte varint encoding inline, rather than handling one-byte and two-byte varints inline. + * Avoid inlining some large heavily duplicated routines in repeated_ptr_field.h + * Add ReflectiveProtoHook to Reflection. + * Turns on table-driven parser for reflection based objects. + Kotlin * Suppress deprecation warnings in Kotlin generated code. From 78b1dc169c16477fc98ec36813584050603b14f9 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Fri, 9 Sep 2022 10:59:39 -0700 Subject: [PATCH 3/5] Spelling fixes --- src/google/protobuf/compiler/cpp/generator.cc | 6 ++---- src/google/protobuf/io/printer.cc | 4 ++-- src/google/protobuf/io/printer.h | 8 ++++---- src/google/protobuf/parse_context.cc | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/google/protobuf/compiler/cpp/generator.cc b/src/google/protobuf/compiler/cpp/generator.cc index 578d0d6969..3c25ec84d1 100644 --- a/src/google/protobuf/compiler/cpp/generator.cc +++ b/src/google/protobuf/compiler/cpp/generator.cc @@ -83,11 +83,9 @@ absl::flat_hash_map CommonVars( : "GOOGLE3_PROTOBU" "F"}, {"CHK", is_oss ? "GOOGLE_CHECK" - : "CHEC" - "K"}, + : "CHECK"}, {"DCHK", is_oss ? "GOOGLE_DCHECK" - : "DCHEC" - "K"}, + : "DCHECK"}, }; } } // namespace diff --git a/src/google/protobuf/io/printer.cc b/src/google/protobuf/io/printer.cc index f357b766be..0b8e053ea2 100644 --- a/src/google/protobuf/io/printer.cc +++ b/src/google/protobuf/io/printer.cc @@ -320,8 +320,8 @@ bool Printer::ValidateIndexLookupInBounds(size_t index, void Printer::PrintImpl(absl::string_view format, absl::Span args, PrintOptions opts) { - // Inside of this function, we set intentation as we print new lines from the - // format string. No matter how we exit this functon, we should fix up the + // Inside of this function, we set indentation as we print new lines from the + // format string. No matter how we exit this function, we should fix up the // indent to what it was before we entered; a cleanup makes it easy to avoid // this mistake. size_t original_indent = indent_; diff --git a/src/google/protobuf/io/printer.h b/src/google/protobuf/io/printer.h index 844eed2a83..b2d6d05e4f 100644 --- a/src/google/protobuf/io/printer.h +++ b/src/google/protobuf/io/printer.h @@ -220,7 +220,7 @@ class AnnotationProtoCollector : public AnnotationCollector { // pointer (which will cause the Printer to store a pointer, potentially // avoiding a copy.) // -// p.Emit(vars, "..."); is effecitvely syntax sugar for +// p.Emit(vars, "..."); is effectively syntax sugar for // // { auto v = p.WithVars(vars); p.Emit("..."); } // @@ -230,7 +230,7 @@ class AnnotationProtoCollector : public AnnotationCollector { // # Annotations // // If Printer is given an AnnotationCollector, it will use it to record which -// spans of genreated code correspond to user-indicated descriptors. There are +// spans of generated code correspond to user-indicated descriptors. There are // a few different ways of indicating when to emit annotations. // // The WithAnnotations() function is like WithVars(), but accepts maps with @@ -428,7 +428,7 @@ class PROTOBUF_EXPORT Printer { size_t spaces_per_indent = 2; // Whether to emit a "codegen trace" for calls to Emit(). If true, each call // to Emit() will print a comment indicating where in the source of the - // compiler the Emit() call occured. + // compiler the Emit() call occurred. // // If disengaged, defaults to whether or not the environment variable // `PROTOC_CODEGEN_TRACE` is set. @@ -689,7 +689,7 @@ class PROTOBUF_EXPORT Printer { // If set, leading whitespace will be stripped from the format string to // determine the "extraneous indentation" that is produced when the format // string is a C++ raw string. This is used to remove leading spaces from - // a raw string that would otherwise result in eratic indentation in the + // a raw string that would otherwise result in erratic indentation in the // output. bool strip_raw_string_indentation = false; // If set, the annotation lookup frames are searched, per the annotation diff --git a/src/google/protobuf/parse_context.cc b/src/google/protobuf/parse_context.cc index 29f53e278b..afbc1ee38b 100644 --- a/src/google/protobuf/parse_context.cc +++ b/src/google/protobuf/parse_context.cc @@ -581,7 +581,7 @@ const char* UnknownFieldParse(uint32_t tag, std::string* unknown, // // 2) Calculate the index of the cleared continuation bit in order to determine // where the encoded Varint ends and the size of the decoded value. The -// easist way to do this is mask off all data bits, leaving just the +// easiest way to do this is mask off all data bits, leaving just the // continuation bits. We actually need to do the masking on an inverted // copy of the data, which leaves a 1 in all continuation bits which were // originally clear. The number of trailing zeroes in this value indicates From 081901beab702acf0cae0c8eec8dd1ae679c12c1 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Fri, 9 Sep 2022 13:03:37 -0700 Subject: [PATCH 4/5] Bump upb version to head --- protobuf_deps.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl index e276c88884..427f29fb60 100644 --- a/protobuf_deps.bzl +++ b/protobuf_deps.bzl @@ -115,6 +115,6 @@ def protobuf_deps(): _github_archive( name = "upb", repo = "https://github.com/protocolbuffers/upb", - commit = "470f06cccbf26f98dd2df7ddecf24a78f140fe11", - sha256 = "c3137f3da811142d33d2ad278d093152610d3a773b17839d272bca4b1a6e304b", + commit = "5485645125ba3783ae2b597bd7b77679721cb1c6", + sha256 = "86de85c58eb3cb04b0987a7642ce84e55629f704ab4a9a0210a660a1115f1dd0", ) From 39ab3f9684211ac3909a6cf0a992b28721d8df85 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Fri, 9 Sep 2022 12:08:23 -0700 Subject: [PATCH 5/5] Fix breakages from sync --- CHANGES.txt | 4 +- python/google/protobuf/pyext/map_container.cc | 1 - python/google/protobuf/pyext/message.cc | 38 +++++++++---------- .../pyext/repeated_composite_container.cc | 1 - .../compiler/csharp/csharp_map_field.cc | 2 +- .../protobuf/io/coded_stream_unittest.cc | 6 +-- src/google/protobuf/io/printer.h | 9 ++++- .../protobuf/io/zero_copy_stream_unittest.cc | 2 +- src/google/protobuf/parse_context.cc | 4 -- 9 files changed, 34 insertions(+), 33 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 929ff134ee..9593319d0e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -14,7 +14,9 @@ * Add ARM-optimized Varint decoding functions. * Minor optimization for parsing groups * Declare ReflectiveProtoHook class - * Reduce size of VarintParse code in protocol buffers, by calling the shared routine after handling just one-byte varint encoding inline, rather than handling one-byte and two-byte varints inline. + * Reduce size of VarintParse code in protocol buffers, by calling the shared + routine after handling just one-byte varint encoding inline, rather than + handling one-byte and two-byte varints inline. * Avoid inlining some large heavily duplicated routines in repeated_ptr_field.h * Add ReflectiveProtoHook to Reflection. * Turns on table-driven parser for reflection based objects. diff --git a/python/google/protobuf/pyext/map_container.cc b/python/google/protobuf/pyext/map_container.cc index e7ff1c8b63..e5496105bb 100644 --- a/python/google/protobuf/pyext/map_container.cc +++ b/python/google/protobuf/pyext/map_container.cc @@ -44,7 +44,6 @@ #include "google/protobuf/pyext/message_factory.h" #include "google/protobuf/pyext/repeated_composite_container.h" #include "google/protobuf/pyext/scoped_pyobject_ptr.h" -#include "util/gtl/map_util.h" namespace google { namespace protobuf { diff --git a/python/google/protobuf/pyext/message.cc b/python/google/protobuf/pyext/message.cc index a56264ea81..13495851f5 100644 --- a/python/google/protobuf/pyext/message.cc +++ b/python/google/protobuf/pyext/message.cc @@ -73,7 +73,6 @@ #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/io/strtod.h" #include "google/protobuf/io/zero_copy_stream_impl_lite.h" -#include "util/gtl/map_util.h" // clang-format off #include "google/protobuf/port_def.inc" @@ -2677,22 +2676,22 @@ CMessage* CMessage::BuildSubMessageFromPointer( if (!this->child_submessages) { this->child_submessages = new CMessage::SubMessagesMap(); } - CMessage* cmsg = gtl::FindPtrOrNull( - *this->child_submessages, sub_message); - if (cmsg) { - Py_INCREF(cmsg); - } else { - cmsg = cmessage::NewEmptyMessage(message_class); + auto it = this->child_submessages->find(sub_message); + if (it != this->child_submessages->end()) { + Py_INCREF(it->second); + return it->second; + } - if (cmsg == nullptr) { - return nullptr; - } - cmsg->message = sub_message; - Py_INCREF(this); - cmsg->parent = this; - cmsg->parent_field_descriptor = field_descriptor; - cmessage::SetSubmessage(this, cmsg); + CMessage* cmsg = cmessage::NewEmptyMessage(message_class); + + if (cmsg == nullptr) { + return nullptr; } + cmsg->message = sub_message; + Py_INCREF(this); + cmsg->parent = this; + cmsg->parent_field_descriptor = field_descriptor; + cmessage::SetSubmessage(this, cmsg); return cmsg; } @@ -2700,11 +2699,10 @@ CMessage* CMessage::MaybeReleaseSubMessage(Message* sub_message) { if (!this->child_submessages) { return nullptr; } - CMessage* released = gtl::FindPtrOrNull( - *this->child_submessages, sub_message); - if (!released) { - return nullptr; - } + auto it = this->child_submessages->find(sub_message); + if (it == this->child_submessages->end()) return nullptr; + CMessage* released = it->second; + // The target message will now own its content. Py_CLEAR(released->parent); released->parent_field_descriptor = nullptr; diff --git a/python/google/protobuf/pyext/repeated_composite_container.cc b/python/google/protobuf/pyext/repeated_composite_container.cc index c813e32221..a191670876 100644 --- a/python/google/protobuf/pyext/repeated_composite_container.cc +++ b/python/google/protobuf/pyext/repeated_composite_container.cc @@ -46,7 +46,6 @@ #include "google/protobuf/pyext/message.h" #include "google/protobuf/pyext/message_factory.h" #include "google/protobuf/pyext/scoped_pyobject_ptr.h" -#include "util/gtl/map_util.h" namespace google { namespace protobuf { diff --git a/src/google/protobuf/compiler/csharp/csharp_map_field.cc b/src/google/protobuf/compiler/csharp/csharp_map_field.cc index 5511536b8e..34ea3e9b72 100644 --- a/src/google/protobuf/compiler/csharp/csharp_map_field.cc +++ b/src/google/protobuf/compiler/csharp/csharp_map_field.cc @@ -98,7 +98,7 @@ void MapFieldGenerator::GenerateMembers(io::Printer* printer) { void MapFieldGenerator::GenerateMergingCode(io::Printer* printer) { printer->Print( variables_, - "$name$_.Add(other.$name$_);\n"); + "$name$_.MergeFrom(other.$name$_);\n"); } void MapFieldGenerator::GenerateParsingCode(io::Printer* printer) { diff --git a/src/google/protobuf/io/coded_stream_unittest.cc b/src/google/protobuf/io/coded_stream_unittest.cc index 6f12482900..1fca15c49c 100644 --- a/src/google/protobuf/io/coded_stream_unittest.cc +++ b/src/google/protobuf/io/coded_stream_unittest.cc @@ -136,7 +136,7 @@ class CodedStreamTest : public testing::Test { static uint8_t buffer_[kBufferSize]; }; -uint8_t CodedStreamTest::buffer_[CodedStreamTest::kBufferSize]; +uint8_t CodedStreamTest::buffer_[CodedStreamTest::kBufferSize] = {}; // We test each operation over a variety of block sizes to insure that // we test cases where reads or writes cross buffer boundaries, cases @@ -727,7 +727,7 @@ TEST_1D(CodedStreamTest, ReadStringImpossiblyLarge, kBlockSizes) { TEST_F(CodedStreamTest, ReadStringImpossiblyLargeFromStringOnStack) { // Same test as above, except directly use a buffer. This used to cause // crashes while the above did not. - uint8_t buffer[8]; + uint8_t buffer[8] = {}; CodedInputStream coded_input(buffer, 8); std::string str; EXPECT_FALSE(coded_input.ReadString(&str, 1 << 30)); @@ -1318,7 +1318,7 @@ class ReallyBigInputStream : public ZeroCopyInputStream { int backup_amount_; private: - char buffer_[1024]; + char buffer_[1024] = {}; int64_t buffer_count_; }; diff --git a/src/google/protobuf/io/printer.h b/src/google/protobuf/io/printer.h index b2d6d05e4f..3c096a48d2 100644 --- a/src/google/protobuf/io/printer.h +++ b/src/google/protobuf/io/printer.h @@ -414,6 +414,13 @@ class PROTOBUF_EXPORT Printer { // Options for controlling how the output of a Printer is formatted. struct Options { + Options() = default; + Options(const Options&) = default; + Options(Options&&) = default; + Options(char variable_delimiter, AnnotationCollector* annotation_collector) + : variable_delimiter(variable_delimiter), + annotation_collector(annotation_collector) {} + // The delimiter for variable substitutions, e.g. $foo$. char variable_delimiter = kDefaultVariableDelimiter; // An optional listener the Printer calls whenever it emits a source @@ -432,7 +439,7 @@ class PROTOBUF_EXPORT Printer { // // If disengaged, defaults to whether or not the environment variable // `PROTOC_CODEGEN_TRACE` is set. - absl::optional enable_codegen_trace; + absl::optional enable_codegen_trace = absl::nullopt; }; // Constructs a new Printer with the default options to output to diff --git a/src/google/protobuf/io/zero_copy_stream_unittest.cc b/src/google/protobuf/io/zero_copy_stream_unittest.cc index 81a5e0589c..d82354e571 100644 --- a/src/google/protobuf/io/zero_copy_stream_unittest.cc +++ b/src/google/protobuf/io/zero_copy_stream_unittest.cc @@ -1053,7 +1053,7 @@ TEST_F(IoTest, LimitingInputStream) { TEST_F(IoTest, LimitingInputStreamByteCount) { const int kHalfBufferSize = 128; const int kBufferSize = kHalfBufferSize * 2; - uint8 buffer[kBufferSize]; + uint8 buffer[kBufferSize] = {}; // Set up input. Only allow half to be read at once. ArrayInputStream array_input(buffer, kBufferSize, kHalfBufferSize); diff --git a/src/google/protobuf/parse_context.cc b/src/google/protobuf/parse_context.cc index afbc1ee38b..34063195c8 100644 --- a/src/google/protobuf/parse_context.cc +++ b/src/google/protobuf/parse_context.cc @@ -30,10 +30,6 @@ #include "google/protobuf/parse_context.h" -#ifdef __aarch64__ -#include -#endif - #include "google/protobuf/io/coded_stream.h" #include "google/protobuf/io/zero_copy_stream.h" #include "google/protobuf/arenastring.h"