Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate from Piper @304070343 for C++, Java, and Python #7344

Merged
merged 5 commits into from
Apr 1, 2020
Merged

Integrate from Piper @304070343 for C++, Java, and Python #7344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b99994d
Sync from Piper @304070343
haberman Mar 31, 2020
9c676d8
Regenerated protos with ./generate_descriptor_proto.sh
haberman Mar 31, 2020
6e229f1
Revert mistake in the previous integration.
haberman Apr 1, 2020
2435589
Some fixes to make the tests pass on Bazel.
haberman Apr 1, 2020
462b928
Fixed build errors on MacOS.
haberman Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@ RELATIVE_TEST_PROTOS = [
"google/protobuf/unittest_proto3_arena.proto",
"google/protobuf/unittest_proto3_arena_lite.proto",
"google/protobuf/unittest_proto3_lite.proto",
"google/protobuf/unittest_proto3_optional.proto",
"google/protobuf/unittest_well_known_types.proto",
"google/protobuf/util/internal/testdata/anys.proto",
"google/protobuf/util/internal/testdata/books.proto",
Expand Down
2 changes: 2 additions & 0 deletions benchmarks/datasets/google_message2/benchmark_message2.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
// (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";
Expand Down
5 changes: 4 additions & 1 deletion benchmarks/datasets/google_message3/benchmark_message3.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,19 @@
// (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

syntax = "proto2";

package benchmarks.google_message3;

import "datasets/google_message3/benchmark_message3_1.proto";
import "datasets/google_message3/benchmark_message3_2.proto";
import "datasets/google_message3/benchmark_message3_3.proto";
import "datasets/google_message3/benchmark_message3_4.proto";
import "datasets/google_message3/benchmark_message3_5.proto";
import "datasets/google_message3/benchmark_message3_7.proto";
import "datasets/google_message3/benchmark_message3_8.proto";
package benchmarks.google_message3;

option cc_enable_arenas = true;
option java_package = "com.google.protobuf.benchmarks";
Expand Down
47 changes: 18 additions & 29 deletions benchmarks/datasets/google_message3/benchmark_message3_1.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,17 @@
// (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

syntax = "proto2";

package benchmarks.google_message3;

import "datasets/google_message3/benchmark_message3_2.proto";
import "datasets/google_message3/benchmark_message3_3.proto";
import "datasets/google_message3/benchmark_message3_5.proto";
import "datasets/google_message3/benchmark_message3_7.proto";
import "datasets/google_message3/benchmark_message3_8.proto";
package benchmarks.google_message3;

option cc_enable_arenas = true;
option java_package = "com.google.protobuf.benchmarks";
Expand Down Expand Up @@ -130,15 +133,13 @@ message Message36876 {
optional int32 field37047 = 115;
optional int32 field37048 = 157;
}
repeated group Message36878 = 168 {
}
repeated group Message36878 = 168 {}
repeated group Message36879 = 55 {
required string field37050 = 56;
optional int32 field37051 = 69;
}
repeated .benchmarks.google_message3.UnusedEmptyMessage field36984 = 78;
optional group Message36880 = 137 {
}
optional group Message36880 = 137 {}
optional uint64 field36986 = 59;
optional bytes field36987 = 121;
optional .benchmarks.google_message3.UnusedEmptyMessage field36988 = 2;
Expand All @@ -154,11 +155,9 @@ message Message36876 {
optional int32 field36998 = 47;
optional int32 field36999 = 48;
optional .benchmarks.google_message3.UnusedEmptyMessage field37000 = 68;
repeated group Message36881 = 23 {
}
repeated group Message36881 = 23 {}
optional .benchmarks.google_message3.Message4144 field37002 = 125;
repeated group Message36882 = 35 {
}
repeated group Message36882 = 35 {}
optional .benchmarks.google_message3.UnusedEmptyMessage field37004 = 49;
optional .benchmarks.google_message3.Message18921 field37005 = 52;
optional .benchmarks.google_message3.Message36858 field37006 = 46;
Expand All @@ -171,20 +170,15 @@ message Message36876 {
optional .benchmarks.google_message3.Message0 field37013 = 143;
optional .benchmarks.google_message3.UnusedEmptyMessage field37014 = 53;
optional .benchmarks.google_message3.Message36869 field37015 = 15;
optional group Message36883 = 3 {
}
repeated group Message36884 = 16 {
}
repeated group Message36885 = 27 {
}
optional group Message36886 = 32 {
}
optional group Message36883 = 3 {}
repeated group Message36884 = 16 {}
repeated group Message36885 = 27 {}
optional group Message36886 = 32 {}
repeated .benchmarks.google_message3.UnusedEnum field37020 = 71;
repeated int32 field37021 = 70;
optional .benchmarks.google_message3.UnusedEmptyMessage field37022 = 66;
optional .benchmarks.google_message3.Message13090 field37023 = 67;
optional group Message36887 = 62 {
}
optional group Message36887 = 62 {}
repeated .benchmarks.google_message3.Message10155 field37025 = 50;
repeated .benchmarks.google_message3.Message11874 field37026 = 151;
optional string field37027 = 12;
Expand Down Expand Up @@ -232,8 +226,7 @@ message Message36876 {
optional int32 field37118 = 160;
repeated string field37119 = 161;
}
repeated group Message36910 = 119 {
}
repeated group Message36910 = 119 {}
optional group Message36911 = 126 {
optional .benchmarks.google_message3.UnusedEmptyMessage field37121 = 127;
optional .benchmarks.google_message3.Message35538 field37122 = 130;
Expand All @@ -247,11 +240,9 @@ message Message36876 {
optional .benchmarks.google_message3.UnusedEmptyMessage field37042 = 155;
}

message Message1328 {
}
message Message1328 {}

message Message6850 {
}
message Message6850 {}

message Message6863 {
optional .benchmarks.google_message3.Enum6858 field6931 = 1;
Expand Down Expand Up @@ -289,8 +280,7 @@ message Message6863 {
optional bool field6963 = 34;
}

message Message6871 {
}
message Message6871 {}

message Message7547 {
required bytes field7549 = 1;
Expand All @@ -312,8 +302,7 @@ message Message7648 {
optional bool field7680 = 12;
}

message Message7865 {
}
message Message7865 {}

message Message7928 {
optional string field7940 = 1;
Expand Down
14 changes: 7 additions & 7 deletions benchmarks/datasets/google_message3/benchmark_message3_2.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,17 @@
// (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

syntax = "proto2";

package benchmarks.google_message3;

import "datasets/google_message3/benchmark_message3_3.proto";
import "datasets/google_message3/benchmark_message3_4.proto";
import "datasets/google_message3/benchmark_message3_5.proto";
import "datasets/google_message3/benchmark_message3_7.proto";
import "datasets/google_message3/benchmark_message3_8.proto";
package benchmarks.google_message3;

option cc_enable_arenas = true;
option java_package = "com.google.protobuf.benchmarks";
Expand Down Expand Up @@ -109,8 +112,7 @@ message Message24391 {
repeated string field24655 = 6;
}

message Message27454 {
}
message Message27454 {}

message Message27357 {
optional string field27410 = 1;
Expand Down Expand Up @@ -192,8 +194,7 @@ message Message36869 {
}

message Message33968 {
repeated group Message33969 = 1 {
}
repeated group Message33969 = 1 {}
repeated .benchmarks.google_message3.Message33958 field33989 = 3;
optional .benchmarks.google_message3.UnusedEmptyMessage field33990 = 106;
optional bool field33991 = 108;
Expand Down Expand Up @@ -268,8 +269,7 @@ message Message35573 {
optional string field35696 = 1000;
optional string field35697 = 1004;
optional int32 field35698 = 1003;
repeated group Message35574 = 1012 {
}
repeated group Message35574 = 1012 {}
optional int64 field35700 = 1011;
optional int64 field35701 = 1005;
optional int64 field35702 = 1006;
Expand Down
11 changes: 6 additions & 5 deletions benchmarks/datasets/google_message3/benchmark_message3_3.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,16 @@
// (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

syntax = "proto2";

package benchmarks.google_message3;

import "datasets/google_message3/benchmark_message3_4.proto";
import "datasets/google_message3/benchmark_message3_5.proto";
import "datasets/google_message3/benchmark_message3_7.proto";
import "datasets/google_message3/benchmark_message3_8.proto";
package benchmarks.google_message3;

option cc_enable_arenas = true;
option java_package = "com.google.protobuf.benchmarks";
Expand Down Expand Up @@ -96,8 +99,7 @@ message Message2356 {
optional bytes field2410 = 124;
}
optional string field2389 = 120;
optional group Message2358 = 107 {
}
optional group Message2358 = 107 {}
repeated group Message2359 = 40 {
optional string field2413 = 41;
optional string field2414 = 42;
Expand Down Expand Up @@ -438,8 +440,7 @@ message Message16724 {
optional bool field16773 = 13;
}

message Message17728 {
}
message Message17728 {}

message Message24356 {
optional string field24559 = 1;
Expand Down
32 changes: 13 additions & 19 deletions benchmarks/datasets/google_message3/benchmark_message3_4.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,21 @@
// (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

syntax = "proto2";

package benchmarks.google_message3;

import "datasets/google_message3/benchmark_message3_5.proto";
import "datasets/google_message3/benchmark_message3_6.proto";
import "datasets/google_message3/benchmark_message3_7.proto";
import "datasets/google_message3/benchmark_message3_8.proto";
package benchmarks.google_message3;

option cc_enable_arenas = true;
option java_package = "com.google.protobuf.benchmarks";

message Message24346 {
}
message Message24346 {}

message Message24401 {
optional .benchmarks.google_message3.Message24400 field24679 = 1;
Expand Down Expand Up @@ -219,12 +221,9 @@ message Message13083 {
optional float field13099 = 45;
optional uint64 field13100 = 46;
optional float field13101 = 47;
optional group Message13085 = 16 {
}
repeated group Message13086 = 23 {
}
repeated group Message13087 = 29 {
}
optional group Message13085 = 16 {}
repeated group Message13086 = 23 {}
repeated group Message13087 = 29 {}
optional .benchmarks.google_message3.UnusedEmptyMessage field13105 = 43;
}

Expand Down Expand Up @@ -292,12 +291,10 @@ message Message16816 {
optional float field16826 = 1;
optional .benchmarks.google_message3.Enum16819 field16827 = 2;
optional float field16828 = 3;
repeated group Message16817 = 4 {
}
repeated group Message16817 = 4 {}
optional bool field16830 = 7;
optional bool field16831 = 8;
repeated group Message16818 = 12 {
}
repeated group Message16818 = 12 {}
optional string field16833 = 10;
optional bool field16834 = 13;
optional bool field16835 = 14;
Expand Down Expand Up @@ -338,11 +335,9 @@ message Message1374 {
optional string field1376 = 2;
}

message Message18943 {
}
message Message18943 {}

message Message18944 {
}
message Message18944 {}

message Message18856 {
optional string field18857 = 1;
Expand Down Expand Up @@ -466,8 +461,7 @@ message Message8475 {
optional int64 field8482 = 2;
}

message Message12559 {
}
message Message12559 {}

message Message12817 {
optional int32 field12826 = 1;
Expand Down
Loading