Skip to content

Commit 0400cca

Browse files
author
Adam Cozzette
committed
Integrated internal changes from Google
1 parent 96b535c commit 0400cca

File tree

282 files changed

+15223
-14041
lines changed

Some content is hidden

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

282 files changed

+15223
-14041
lines changed

‎benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,4 @@ void checkCounter() throws IOException {
243243
}
244244
}
245245

246+

‎benchmarks/py_benchmark.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,3 +115,4 @@ def run_benchmark(self, test_method_args='', setup_method_args=''):
115115
if __name__ == "__main__":
116116
for i in range(2, len(sys.argv)):
117117
run_one_test(sys.argv[i])
118+

‎cmake/extract_includes.bat.in‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,6 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\repeated_field.h" inc
7979
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\service.h" include\google\protobuf\service.h
8080
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\source_context.pb.h" include\google\protobuf\source_context.pb.h
8181
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\struct.pb.h" include\google\protobuf\struct.pb.h
82-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomic_sequence_num.h" include\google\protobuf\stubs\atomic_sequence_num.h
83-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops.h" include\google\protobuf\stubs\atomicops.h
84-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_arm64_gcc.h" include\google\protobuf\stubs\atomicops_internals_arm64_gcc.h
85-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_arm_gcc.h" include\google\protobuf\stubs\atomicops_internals_arm_gcc.h
86-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_arm_qnx.h" include\google\protobuf\stubs\atomicops_internals_arm_qnx.h
87-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_generic_c11_atomic.h" include\google\protobuf\stubs\atomicops_internals_generic_c11_atomic.h
88-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_generic_gcc.h" include\google\protobuf\stubs\atomicops_internals_generic_gcc.h
89-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_mips_gcc.h" include\google\protobuf\stubs\atomicops_internals_mips_gcc.h
90-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_power.h" include\google\protobuf\stubs\atomicops_internals_power.h
91-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_ppc_gcc.h" include\google\protobuf\stubs\atomicops_internals_ppc_gcc.h
92-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_solaris.h" include\google\protobuf\stubs\atomicops_internals_solaris.h
93-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_tsan.h" include\google\protobuf\stubs\atomicops_internals_tsan.h
94-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_x86_gcc.h" include\google\protobuf\stubs\atomicops_internals_x86_gcc.h
95-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.h" include\google\protobuf\stubs\atomicops_internals_x86_msvc.h
9682
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\bytestream.h" include\google\protobuf\stubs\bytestream.h
9783
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\callback.h" include\google\protobuf\stubs\callback.h
9884
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\casts.h" include\google\protobuf\stubs\casts.h
@@ -105,8 +91,6 @@ copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\mutex.h" includ
10591
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\once.h" include\google\protobuf\stubs\once.h
10692
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\platform_macros.h" include\google\protobuf\stubs\platform_macros.h
10793
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\port.h" include\google\protobuf\stubs\port.h
108-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\scoped_ptr.h" include\google\protobuf\stubs\scoped_ptr.h
109-
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\shared_ptr.h" include\google\protobuf\stubs\shared_ptr.h
11094
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\singleton.h" include\google\protobuf\stubs\singleton.h
11195
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\status.h" include\google\protobuf\stubs\status.h
11296
copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\stl_util.h" include\google\protobuf\stubs\stl_util.h

‎cmake/libprotobuf-lite.cmake‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@ set(libprotobuf_lite_files
1010
${protobuf_source_dir}/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
1111
${protobuf_source_dir}/src/google/protobuf/message_lite.cc
1212
${protobuf_source_dir}/src/google/protobuf/repeated_field.cc
13-
${protobuf_source_dir}/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
14-
${protobuf_source_dir}/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
1513
${protobuf_source_dir}/src/google/protobuf/stubs/bytestream.cc
1614
${protobuf_source_dir}/src/google/protobuf/stubs/common.cc
1715
${protobuf_source_dir}/src/google/protobuf/stubs/int128.cc
1816
${protobuf_source_dir}/src/google/protobuf/stubs/io_win32.cc
19-
${protobuf_source_dir}/src/google/protobuf/stubs/once.cc
2017
${protobuf_source_dir}/src/google/protobuf/stubs/status.cc
2118
${protobuf_source_dir}/src/google/protobuf/stubs/statusor.cc
2219
${protobuf_source_dir}/src/google/protobuf/stubs/stringpiece.cc
@@ -38,7 +35,6 @@ set(libprotobuf_lite_includes
3835
${protobuf_source_dir}/src/google/protobuf/io/zero_copy_stream_impl_lite.h
3936
${protobuf_source_dir}/src/google/protobuf/message_lite.h
4037
${protobuf_source_dir}/src/google/protobuf/repeated_field.h
41-
${protobuf_source_dir}/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h
4238
${protobuf_source_dir}/src/google/protobuf/stubs/bytestream.h
4339
${protobuf_source_dir}/src/google/protobuf/stubs/common.h
4440
${protobuf_source_dir}/src/google/protobuf/stubs/int128.h

‎cmake/tests.cmake‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,15 @@ set(tests_files
155155
${protobuf_source_dir}/src/google/protobuf/preserve_unknown_enum_test.cc
156156
${protobuf_source_dir}/src/google/protobuf/proto3_arena_lite_unittest.cc
157157
${protobuf_source_dir}/src/google/protobuf/proto3_arena_unittest.cc
158-
${protobuf_source_dir}/src/google/protobuf/proto3_lite_unittest.cc
158+
# TODO(b/74491957) Make this unittest work
159+
# ${protobuf_source_dir}/src/google/protobuf/proto3_lite_unittest.cc
159160
${protobuf_source_dir}/src/google/protobuf/reflection_ops_unittest.cc
160161
${protobuf_source_dir}/src/google/protobuf/repeated_field_reflection_unittest.cc
161162
${protobuf_source_dir}/src/google/protobuf/repeated_field_unittest.cc
162163
${protobuf_source_dir}/src/google/protobuf/stubs/bytestream_unittest.cc
163164
${protobuf_source_dir}/src/google/protobuf/stubs/common_unittest.cc
164165
${protobuf_source_dir}/src/google/protobuf/stubs/int128_unittest.cc
165166
${protobuf_source_dir}/src/google/protobuf/stubs/io_win32_unittest.cc
166-
${protobuf_source_dir}/src/google/protobuf/stubs/once_unittest.cc
167167
${protobuf_source_dir}/src/google/protobuf/stubs/status_test.cc
168168
${protobuf_source_dir}/src/google/protobuf/stubs/statusor_test.cc
169169
${protobuf_source_dir}/src/google/protobuf/stubs/stringpiece_unittest.cc
@@ -172,7 +172,6 @@ set(tests_files
172172
${protobuf_source_dir}/src/google/protobuf/stubs/strutil_unittest.cc
173173
${protobuf_source_dir}/src/google/protobuf/stubs/template_util_unittest.cc
174174
${protobuf_source_dir}/src/google/protobuf/stubs/time_test.cc
175-
${protobuf_source_dir}/src/google/protobuf/stubs/type_traits_unittest.cc
176175
${protobuf_source_dir}/src/google/protobuf/text_format_unittest.cc
177176
${protobuf_source_dir}/src/google/protobuf/unknown_field_set_unittest.cc
178177
${protobuf_source_dir}/src/google/protobuf/util/delimited_message_util_test.cc

‎conformance/conformance_test.cc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,6 +1910,10 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
19101910
{
19111911
TestAllTypesProto3 messageProto3;
19121912
TestAllTypesProto2 messageProto2;
1913+
//TODO(yilunchong): update this behavior when unknown field's behavior
1914+
// changed in open source. Also delete
1915+
// Required.Proto3.ProtobufInput.UnknownVarint.ProtobufOutput
1916+
// from failure list of python_cpp python java
19131917
TestUnknownMessage(messageProto3, true);
19141918
TestUnknownMessage(messageProto2, false);
19151919
}

‎conformance/failure_list_java.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ Required.Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValu
4545
Required.Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE
4646
Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE
4747
Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE
48+
Required.Proto3.ProtobufInput.UnknownVarint.ProtobufOutput

‎conformance/failure_list_python.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_0
1919
Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_1
2020
Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_2
2121
Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_3
22+
Required.Proto3.ProtobufInput.UnknownVarint.ProtobufOutput

‎conformance/failure_list_python_cpp.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ Required.Proto2.ProtobufInput.PrematureEofInPackedField.SINT32
5252
Required.Proto2.ProtobufInput.PrematureEofInPackedField.SINT64
5353
Required.Proto2.ProtobufInput.PrematureEofInPackedField.UINT32
5454
Required.Proto2.ProtobufInput.PrematureEofInPackedField.UINT64
55+
Required.Proto3.ProtobufInput.UnknownVarint.ProtobufOutput

‎java/core/src/main/java/com/google/protobuf/AbstractMessage.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,16 @@ public void writeTo(final CodedOutputStream output) throws IOException {
124124

125125
protected int memoizedSize = -1;
126126

127+
@Override
128+
int getMemoizedSerializedSize() {
129+
return memoizedSize;
130+
}
131+
132+
@Override
133+
void setMemoizedSerializedSize(int size) {
134+
memoizedSize = size;
135+
}
136+
127137
@Override
128138
public int getSerializedSize() {
129139
int size = memoizedSize;

0 commit comments

Comments
 (0)