From 41bfbca375ad668a22b81f334729b4a991582518 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Mon, 2 Aug 2021 11:02:23 -0700 Subject: [PATCH 1/2] Updated ads benchmark to v7 as v5 no longer exists upstream. --- benchmarks/BUILD.googleapis | 2 +- benchmarks/benchmark.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/benchmarks/BUILD.googleapis b/benchmarks/BUILD.googleapis index 424f9e855f..a8f31b2a60 100644 --- a/benchmarks/BUILD.googleapis +++ b/benchmarks/BUILD.googleapis @@ -31,7 +31,7 @@ load( proto_library( name = "ads_proto", srcs = glob([ - "google/ads/googleads/v5/**/*.proto", + "google/ads/googleads/v7/**/*.proto", "google/api/**/*.proto", "google/rpc/**/*.proto", "google/longrunning/**/*.proto", diff --git a/benchmarks/benchmark.cc b/benchmarks/benchmark.cc index 178eb21dcd..60e3b530d6 100644 --- a/benchmarks/benchmark.cc +++ b/benchmarks/benchmark.cc @@ -31,7 +31,7 @@ #include "benchmarks/descriptor.upb.h" #include "benchmarks/descriptor.upbdefs.h" #include "benchmarks/descriptor_sv.pb.h" -#include "google/ads/googleads/v5/services/google_ads_service.upbdefs.h" +#include "google/ads/googleads/v7/services/google_ads_service.upbdefs.h" #include "google/protobuf/descriptor.pb.h" #include "upb/def.hpp" @@ -84,7 +84,7 @@ static void BM_LoadAdsDescriptor_Upb(benchmark::State& state) { size_t bytes_per_iter = 0; for (auto _ : state) { upb::SymbolTable symtab; - google_ads_googleads_v5_services_SearchGoogleAdsRequest_getmsgdef( + google_ads_googleads_v7_services_SearchGoogleAdsRequest_getmsgdef( symtab.ptr()); bytes_per_iter = _upb_symtab_bytesloaded(symtab.ptr()); } @@ -111,11 +111,11 @@ static void BM_LoadDescriptor_Proto2(benchmark::State& state) { BENCHMARK(BM_LoadDescriptor_Proto2); static void BM_LoadAdsDescriptor_Proto2(benchmark::State& state) { - extern upb_def_init google_ads_googleads_v5_services_google_ads_service_proto_upbdefinit; + extern upb_def_init google_ads_googleads_v7_services_google_ads_service_proto_upbdefinit; std::vector serialized_files; absl::flat_hash_set seen_files; CollectFileDescriptors( - &google_ads_googleads_v5_services_google_ads_service_proto_upbdefinit, + &google_ads_googleads_v7_services_google_ads_service_proto_upbdefinit, serialized_files, seen_files); size_t bytes_per_iter = 0; for (auto _ : state) { From c2f2e93990a24e5d162d812718a605bdddea82e9 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Mon, 2 Aug 2021 11:26:38 -0700 Subject: [PATCH 2/2] Fix Bazel at 4.1.0 The installer for the prerelease version is busted: https://github.com/bazelbuild/bazel/issues/13791 --- kokoro/ubuntu/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kokoro/ubuntu/build.sh b/kokoro/ubuntu/build.sh index 8b73cfb8f7..64536f640b 100644 --- a/kokoro/ubuntu/build.sh +++ b/kokoro/ubuntu/build.sh @@ -29,7 +29,7 @@ set -ex # Install the latest version of Bazel. if [ -x "$(command -v use_bazel.sh)" ]; then - use_bazel.sh latest + use_bazel.sh 4.1.0 fi # Verify/query CMake