Skip to content

Commit a0376a4

Browse files
Spiritus2424Spiritus2424
authored
Merge branch 'google:master' into master
2 parents 99e96d8 + 703bf7c commit a0376a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+782
-259
lines changed

‎.github/workflows/benchmark.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
sdk: [dev]
2222

2323
steps:
24-
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2525
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
2626
with:
2727
sdk: ${{matrix.sdk}}

‎.github/workflows/protobuf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ${{ matrix.os }}
2424

2525
steps:
26-
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
26+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2727
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
2828
with:
2929
sdk: ${{matrix.sdk}}

‎.github/workflows/protoc_plugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
sdk: [stable, dev]
2222
steps:
23-
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
23+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2424
- uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
2525
with:
2626
sdk: ${{matrix.sdk}}

‎benchmarks/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
pubspec.lock
44

55
lib/generated/
6+
out/

‎benchmarks/bin/deep_copy.dart

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ import 'package:protobuf_benchmarks/generated/google_message1_proto3.pb.dart'
99
as p3;
1010
import 'package:protobuf_benchmarks/generated/google_message2.pb.dart';
1111
import 'package:protobuf_benchmarks/readfile.dart';
12+
import 'package:protobuf/protobuf.dart';
13+
14+
GeneratedMessage? sink1;
15+
GeneratedMessage? sink2;
16+
GeneratedMessage? sink3;
1217

1318
class Benchmark extends BenchmarkBase {
1419
final p2.GoogleMessage1 _message1Proto2;
@@ -26,12 +31,9 @@ class Benchmark extends BenchmarkBase {
2631

2732
@override
2833
void run() {
29-
// ignore: unused_result
30-
_message1Proto2.deepCopy();
31-
// ignore: unused_result
32-
_message1Proto3.deepCopy();
33-
// ignore: unused_result
34-
_message2.deepCopy();
34+
sink1 = _message1Proto2.deepCopy();
35+
sink2 = _message1Proto3.deepCopy();
36+
sink3 = _message2.deepCopy();
3537
}
3638
}
3739

@@ -49,4 +51,10 @@ void main() {
4951
message1Proto3Input,
5052
message2Input,
5153
).report();
54+
55+
if (int.parse('1') == 0) {
56+
print(sink1);
57+
print(sink2);
58+
print(sink3);
59+
}
5260
}

‎benchmarks/bin/from_binary.dart

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ import 'package:protobuf_benchmarks/generated/google_message1_proto3.pb.dart'
1111
as p3;
1212
import 'package:protobuf_benchmarks/generated/google_message2.pb.dart';
1313
import 'package:protobuf_benchmarks/readfile.dart';
14+
import 'package:protobuf/protobuf.dart';
15+
16+
GeneratedMessage? sink1;
17+
GeneratedMessage? sink2;
18+
GeneratedMessage? sink3;
1419

1520
class Benchmark extends BenchmarkBase {
1621
final Uint8List _message1Proto2Input;
@@ -28,9 +33,9 @@ class Benchmark extends BenchmarkBase {
2833

2934
@override
3035
void run() {
31-
p2.GoogleMessage1.fromBuffer(_message1Proto2Input);
32-
p3.GoogleMessage1.fromBuffer(_message1Proto3Input);
33-
GoogleMessage2.fromBuffer(_message2Input);
36+
sink1 = p2.GoogleMessage1.fromBuffer(_message1Proto2Input);
37+
sink2 = p3.GoogleMessage1.fromBuffer(_message1Proto3Input);
38+
sink3 = GoogleMessage2.fromBuffer(_message2Input);
3439
}
3540
}
3641

@@ -48,4 +53,10 @@ void main() {
4853
message1Proto3Input,
4954
message2Input,
5055
).report();
56+
57+
if (int.parse('1') == 0) {
58+
print(sink1);
59+
print(sink2);
60+
print(sink3);
61+
}
5162
}

‎benchmarks/bin/from_json_string.dart

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ import 'package:protobuf_benchmarks/generated/google_message1_proto3.pb.dart'
99
as p3;
1010
import 'package:protobuf_benchmarks/generated/google_message2.pb.dart';
1111
import 'package:protobuf_benchmarks/readfile.dart';
12+
import 'package:protobuf/protobuf.dart';
13+
14+
GeneratedMessage? sink1;
15+
GeneratedMessage? sink2;
16+
GeneratedMessage? sink3;
1217

1318
class Benchmark extends BenchmarkBase {
1419
final String _message1Proto2JsonString;
@@ -29,9 +34,9 @@ class Benchmark extends BenchmarkBase {
2934

3035
@override
3136
void run() {
32-
p2.GoogleMessage1.fromJson(_message1Proto2JsonString);
33-
p3.GoogleMessage1.fromJson(_message1Proto3JsonString);
34-
GoogleMessage2.fromJson(_message2JsonString);
37+
sink1 = p2.GoogleMessage1.fromJson(_message1Proto2JsonString);
38+
sink2 = p3.GoogleMessage1.fromJson(_message1Proto3JsonString);
39+
sink3 = GoogleMessage2.fromJson(_message2JsonString);
3540
}
3641
}
3742

@@ -49,4 +54,10 @@ void main() {
4954
message1Proto3Input,
5055
message2Input,
5156
).report();
57+
58+
if (int.parse('1') == 0) {
59+
print(sink1);
60+
print(sink2);
61+
print(sink3);
62+
}
5263
}

‎benchmarks/bin/from_proto3_json_object.dart

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ import 'package:protobuf_benchmarks/generated/google_message1_proto3.pb.dart'
99
as p3;
1010
import 'package:protobuf_benchmarks/generated/google_message2.pb.dart';
1111
import 'package:protobuf_benchmarks/readfile.dart';
12+
import 'package:protobuf/protobuf.dart';
13+
14+
GeneratedMessage? sink1;
15+
GeneratedMessage? sink2;
16+
GeneratedMessage? sink3;
1217

1318
class Benchmark extends BenchmarkBase {
1419
final Object? _message1Proto2Proto3JsonObject;
@@ -29,13 +34,14 @@ class Benchmark extends BenchmarkBase {
2934

3035
@override
3136
void run() {
32-
p2.GoogleMessage1.create().mergeFromProto3Json(
33-
_message1Proto2Proto3JsonObject,
34-
);
35-
p3.GoogleMessage1.create().mergeFromProto3Json(
36-
_message1Proto3Proto3JsonObject,
37-
);
38-
GoogleMessage2.create().mergeFromProto3Json(_message2Proto3JsonObject);
37+
sink1 =
38+
p2.GoogleMessage1.create()
39+
..mergeFromProto3Json(_message1Proto2Proto3JsonObject);
40+
sink2 =
41+
p3.GoogleMessage1.create()
42+
..mergeFromProto3Json(_message1Proto3Proto3JsonObject);
43+
sink3 =
44+
GoogleMessage2.create()..mergeFromProto3Json(_message2Proto3JsonObject);
3945
}
4046
}
4147

@@ -53,4 +59,10 @@ void main() {
5359
message1Proto3Input,
5460
message2Input,
5561
).report();
62+
63+
if (int.parse('1') == 0) {
64+
print(sink1);
65+
print(sink2);
66+
print(sink3);
67+
}
5668
}

‎benchmarks/bin/from_proto3_json_string.dart

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ import 'package:protobuf_benchmarks/generated/google_message1_proto3.pb.dart'
1111
as p3;
1212
import 'package:protobuf_benchmarks/generated/google_message2.pb.dart';
1313
import 'package:protobuf_benchmarks/readfile.dart';
14+
import 'package:protobuf/protobuf.dart';
15+
16+
GeneratedMessage? sink1;
17+
GeneratedMessage? sink2;
18+
GeneratedMessage? sink3;
1419

1520
class Benchmark extends BenchmarkBase {
1621
final String _message1Proto2Proto3JsonString;
@@ -34,15 +39,15 @@ class Benchmark extends BenchmarkBase {
3439

3540
@override
3641
void run() {
37-
p2.GoogleMessage1.create().mergeFromProto3Json(
38-
jsonDecode(_message1Proto2Proto3JsonString),
39-
);
40-
p3.GoogleMessage1.create().mergeFromProto3Json(
41-
jsonDecode(_message1Proto3Proto3JsonString),
42-
);
43-
GoogleMessage2.create().mergeFromProto3Json(
44-
jsonDecode(_message2Proto3JsonString),
45-
);
42+
sink1 =
43+
p2.GoogleMessage1.create()
44+
..mergeFromProto3Json(jsonDecode(_message1Proto2Proto3JsonString));
45+
sink2 =
46+
p3.GoogleMessage1.create()
47+
..mergeFromProto3Json(jsonDecode(_message1Proto3Proto3JsonString));
48+
sink3 =
49+
GoogleMessage2.create()
50+
..mergeFromProto3Json(jsonDecode(_message2Proto3JsonString));
4651
}
4752
}
4853

@@ -60,4 +65,10 @@ void main() {
6065
message1Proto3Input,
6166
message2Input,
6267
).report();
68+
69+
if (int.parse('1') == 0) {
70+
print(sink1);
71+
print(sink2);
72+
print(sink3);
73+
}
6374
}

‎benchmarks/bin/hash_code.dart

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ import 'package:protobuf_benchmarks/generated/google_message1_proto3.pb.dart'
1010
import 'package:protobuf_benchmarks/generated/google_message2.pb.dart';
1111
import 'package:protobuf_benchmarks/readfile.dart';
1212

13+
int sink1 = 0;
14+
int sink2 = 0;
15+
int sink3 = 0;
16+
1317
class Benchmark extends BenchmarkBase {
1418
final p2.GoogleMessage1 _message1Proto2;
1519
final p3.GoogleMessage1 _message1Proto3;
@@ -26,9 +30,9 @@ class Benchmark extends BenchmarkBase {
2630

2731
@override
2832
void run() {
29-
_message1Proto2.hashCode;
30-
_message1Proto3.hashCode;
31-
_message2.hashCode;
33+
sink1 = _message1Proto2.hashCode;
34+
sink2 = _message1Proto3.hashCode;
35+
sink3 = _message2.hashCode;
3236
}
3337
}
3438

@@ -46,4 +50,10 @@ void main() {
4650
message1Proto3Input,
4751
message2Input,
4852
).report();
53+
54+
if (int.parse('1') == 0) {
55+
print(sink1);
56+
print(sink2);
57+
print(sink3);
58+
}
4959
}

0 commit comments

Comments
 (0)