Skip to content
Permalink
Browse files

Down Integrate Internal Changes

  • Loading branch information
rafi-kamal committed Nov 12, 2019
1 parent 6fc04c3 commit 58d4420e2dd8a3cd354fff9db0052881c25369ce
Showing with 3,200 additions and 2,787 deletions.
  1. +0 −1 BUILD
  2. +0 −2 cmake/libprotobuf.cmake
  3. +30 −0 conformance/ConformanceJava.java
  4. +29 −0 conformance/ConformanceJavaLite.java
  5. +282 −257 conformance/binary_json_conformance_suite.cc
  6. +12 −3 conformance/binary_json_conformance_suite.h
  7. +2 −2 conformance/conformance.proto
  8. +20 −14 conformance/conformance_cpp.cc
  9. +0 −3 conformance/conformance_python.py
  10. +27 −34 conformance/conformance_test.cc
  11. +4 −6 conformance/conformance_test.h
  12. +19 −24 conformance/conformance_test_runner.cc
  13. +1 −0 conformance/failure_list_js.txt
  14. +22 −20 conformance/text_format_conformance_suite.cc
  15. +1 −1 csharp/src/Google.Protobuf.Conformance/Conformance.cs
  16. BIN csharp/src/Google.Protobuf.Test/testprotos.pb
  17. +1 −1 csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
  18. +7 −3 java/core/src/main/java/com/google/protobuf/ByteString.java
  19. +1 −1 java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java
  20. +1 −2 java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
  21. +1 −1 java/core/src/main/java/com/google/protobuf/MessageLiteToString.java
  22. +3 −5 java/core/src/main/java/com/google/protobuf/MessageSchema.java
  23. +22 −6 java/core/src/main/java/com/google/protobuf/RopeByteString.java
  24. +5 −4 java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java
  25. +25 −0 java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
  26. +3 −0 java/lite/proguard.pgcfg
  27. +3 −3 js/binary/decoder.js
  28. +1 −1 js/binary/encoder.js
  29. +3 −3 js/binary/proto_test.js
  30. +4 −4 js/binary/reader.js
  31. +1 −1 js/binary/utils.js
  32. +3 −3 js/binary/utils_test.js
  33. +1 −1 js/binary/writer.js
  34. +5 −5 js/map.js
  35. +5 −5 js/message.js
  36. +1 −1 js/message_test.js
  37. +1 −1 js/proto3_test.js
  38. +1 −1 objectivec/google/protobuf/FieldMask.pbobjc.h
  39. +1 −5 python/google/protobuf/descriptor.py
  40. +10 −2 python/google/protobuf/internal/enum_type_wrapper.py
  41. +8 −0 python/google/protobuf/internal/json_format_test.py
  42. +782 −743 python/google/protobuf/internal/reflection_test.py
  43. +25 −1 python/google/protobuf/internal/text_format_test.py
  44. +20 −5 python/google/protobuf/json_format.py
  45. +0 −4 python/google/protobuf/pyext/message.cc
  46. +13 −3 python/google/protobuf/text_format.py
  47. +0 −2 src/Makefile.am
  48. +6 −3 src/google/protobuf/any.pb.cc
  49. +1 −2 src/google/protobuf/any.pb.h
  50. +29 −15 src/google/protobuf/api.pb.cc
  51. +3 −3 src/google/protobuf/api.pb.h
  52. +5 −32 src/google/protobuf/arena.cc
  53. +7 −3 src/google/protobuf/arena.h
  54. +64 −3 src/google/protobuf/arena_impl.h
  55. +1 −0 src/google/protobuf/arenastring.h
  56. +1 −1 src/google/protobuf/arenastring_unittest.cc
  57. +9 −5 src/google/protobuf/compiler/command_line_interface.cc
  58. +2 −0 src/google/protobuf/compiler/command_line_interface.h
  59. +17 −5 src/google/protobuf/compiler/command_line_interface_unittest.cc
  60. +4 −6 src/google/protobuf/compiler/cpp/cpp_enum.cc
  61. +1 −2 src/google/protobuf/compiler/cpp/cpp_field.cc
  62. +0 −4 src/google/protobuf/compiler/cpp/cpp_file.cc
  63. +55 −59 src/google/protobuf/compiler/cpp/cpp_helpers.cc
  64. +16 −3 src/google/protobuf/compiler/cpp/cpp_helpers.h
  65. +21 −19 src/google/protobuf/compiler/cpp/cpp_message.cc
  66. +6 −8 src/google/protobuf/compiler/cpp/cpp_message_field.cc
  67. +2 −2 src/google/protobuf/compiler/cpp/cpp_string_field.cc
  68. +1 −0 src/google/protobuf/compiler/csharp/csharp_helpers.h
  69. +1 −0 src/google/protobuf/compiler/csharp/csharp_names.h
  70. +1 −2 src/google/protobuf/compiler/main.cc
  71. +1 −0 src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
  72. +43 −15 src/google/protobuf/compiler/plugin.pb.cc
  73. +10 −10 src/google/protobuf/compiler/plugin.pb.h
  74. +1 −0 src/google/protobuf/descriptor.cc
  75. +298 −153 src/google/protobuf/descriptor.pb.cc
  76. +60 −60 src/google/protobuf/descriptor.pb.h
  77. +6 −6 src/google/protobuf/descriptor_unittest.cc
  78. +1 −1 src/google/protobuf/duration.pb.cc
  79. +1 −1 src/google/protobuf/duration.pb.h
  80. +0 −1 src/google/protobuf/dynamic_message.h
  81. +1 −5 src/google/protobuf/empty.pb.cc
  82. +1 −1 src/google/protobuf/empty.pb.h
  83. +9 −9 src/google/protobuf/extension_set.cc
  84. +5 −6 src/google/protobuf/extension_set.h
  85. +4 −2 src/google/protobuf/field_mask.pb.cc
  86. +1 −1 src/google/protobuf/field_mask.pb.h
  87. +1 −1 src/google/protobuf/field_mask.proto
  88. +13 −13 src/google/protobuf/generated_message_reflection.cc
  89. +5 −2 src/google/protobuf/generated_message_util.h
  90. +2 −2 src/google/protobuf/implicit_weak_message.h
  91. +6 −67 src/google/protobuf/io/strtod.cc
  92. +4 −3 src/google/protobuf/map_entry_lite.h
  93. +15 −0 src/google/protobuf/map_field.h
  94. +7 −2 src/google/protobuf/map_field_lite.h
  95. +1 −1 src/google/protobuf/map_type_handler.h
  96. +19 −21 src/google/protobuf/message.cc
  97. +56 −28 src/google/protobuf/message.h
  98. +52 −3 src/google/protobuf/message_lite.cc
  99. +38 −5 src/google/protobuf/message_lite.h
  100. +0 −8 src/google/protobuf/parse_context.cc
  101. +5 −16 src/google/protobuf/parse_context.h
  102. +166 −14 src/google/protobuf/port_def.inc
  103. +15 −0 src/google/protobuf/port_undef.inc
  104. +16 −8 src/google/protobuf/repeated_field.cc
  105. +15 −8 src/google/protobuf/repeated_field.h
  106. +4 −2 src/google/protobuf/source_context.pb.cc
  107. +1 −1 src/google/protobuf/source_context.pb.h
  108. +9 −7 src/google/protobuf/struct.pb.cc
  109. +8 −8 src/google/protobuf/struct.pb.h
  110. +1 −1 src/google/protobuf/stubs/bytestream.h
  111. +0 −47 src/google/protobuf/stubs/common.cc
  112. +2 −29 src/google/protobuf/stubs/common.h
  113. +0 −89 src/google/protobuf/stubs/mathlimits.cc
  114. +0 −307 src/google/protobuf/stubs/mathlimits.h
  115. +34 −12 src/google/protobuf/stubs/mathutil.h
  116. +3 −31 src/google/protobuf/stubs/port.h
  117. +0 −2 src/google/protobuf/stubs/status.h
  118. +74 −4 src/google/protobuf/stubs/strutil.cc
  119. +8 −0 src/google/protobuf/stubs/strutil.h
  120. +43 −33 src/google/protobuf/stubs/strutil_unittest.cc
  121. +30 −0 src/google/protobuf/test_messages_proto2.proto
  122. +30 −0 src/google/protobuf/test_messages_proto3.proto
  123. +3 −4 src/google/protobuf/text_format.cc
  124. +2 −3 src/google/protobuf/text_format_unittest.cc
  125. +1 −1 src/google/protobuf/timestamp.pb.cc
  126. +1 −1 src/google/protobuf/timestamp.pb.h
  127. +41 −23 src/google/protobuf/type.pb.cc
  128. +5 −5 src/google/protobuf/type.pb.h
  129. +173 −171 src/google/protobuf/unittest_lite.proto
  130. +80 −74 src/google/protobuf/unittest_proto3.proto
  131. +3 −5 src/google/protobuf/util/field_comparator.cc
  132. +8 −11 src/google/protobuf/util/field_comparator_test.cc
  133. +6 −4 src/google/protobuf/util/internal/datapiece.cc
  134. +4 −4 src/google/protobuf/util/internal/json_objectwriter.cc
  135. +3 −3 src/google/protobuf/util/internal/json_stream_parser.cc
  136. +1 −1 src/google/protobuf/util/internal/json_stream_parser_test.cc
  137. +4 −2 src/google/protobuf/util/internal/protostream_objectsource.cc
  138. +2 −0 src/google/protobuf/util/internal/protostream_objectsource.h
  139. +7 −8 src/google/protobuf/util/internal/utility.cc
  140. +8 −4 src/google/protobuf/util/message_differencer.cc
  141. +3 −0 src/google/protobuf/util/message_differencer.h
  142. +21 −19 src/google/protobuf/wire_format.cc
  143. +4 −4 src/google/protobuf/wire_format.h
  144. +1 −2 src/google/protobuf/wire_format_lite.cc
  145. +12 −11 src/google/protobuf/wire_format_lite.h
  146. +14 −11 src/google/protobuf/wrappers.pb.cc
  147. +9 −9 src/google/protobuf/wrappers.pb.h
1 BUILD
@@ -190,7 +190,6 @@ cc_library(
"src/google/protobuf/service.cc",
"src/google/protobuf/source_context.pb.cc",
"src/google/protobuf/struct.pb.cc",
"src/google/protobuf/stubs/mathlimits.cc",
"src/google/protobuf/stubs/substitute.cc",
"src/google/protobuf/text_format.cc",
"src/google/protobuf/timestamp.pb.cc",
@@ -23,7 +23,6 @@ set(libprotobuf_files
${protobuf_source_dir}/src/google/protobuf/service.cc
${protobuf_source_dir}/src/google/protobuf/source_context.pb.cc
${protobuf_source_dir}/src/google/protobuf/struct.pb.cc
${protobuf_source_dir}/src/google/protobuf/stubs/mathlimits.cc
${protobuf_source_dir}/src/google/protobuf/stubs/substitute.cc
${protobuf_source_dir}/src/google/protobuf/text_format.cc
${protobuf_source_dir}/src/google/protobuf/timestamp.pb.cc
@@ -77,7 +76,6 @@ set(libprotobuf_includes
${protobuf_source_dir}/src/google/protobuf/service.h
${protobuf_source_dir}/src/google/protobuf/source_context.pb.h
${protobuf_source_dir}/src/google/protobuf/struct.pb.h
${protobuf_source_dir}/src/google/protobuf/stubs/mathlimits.h
${protobuf_source_dir}/src/google/protobuf/stubs/substitute.h
${protobuf_source_dir}/src/google/protobuf/text_format.h
${protobuf_source_dir}/src/google/protobuf/timestamp.pb.h
@@ -1,3 +1,33 @@
// 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.

import com.google.protobuf.AbstractMessage;
import com.google.protobuf.ByteString;
import com.google.protobuf.CodedInputStream;
@@ -1,3 +1,32 @@
// 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.

import com.google.protobuf.conformance.Conformance;
import com.google.protobuf.InvalidProtocolBufferException;

0 comments on commit 58d4420

Please sign in to comment.
You can’t perform that action at this time.