Commit Graph

6407 Commits

Author SHA1 Message Date
Adam Cozzette
43c3abf077
Merge pull request #5489 from aaron-bray/master
Use NoLocalStrtod for international compliance
2018-12-21 21:07:34 -08:00
Erik Benoist
9ac11326df Adds the ability to ignore unknown fields on parse
This adds the ability for the MRI Ruby library to optionally pass in a
ignore_unknown_fields option when decoding JSON. The functionality was
added upstream in upb, this change exposes that option.
2018-12-21 16:06:21 -06:00
Yilun Chong
152c8301cf
Fix python benchmark throughput; Change back to not using docker for benchmar (#5503) 2018-12-20 17:15:51 -08:00
Paul Yang
1354e469d4
Merge pull request #5502 from TeBoring/github-sync
Down-integrate internal changes to github.
2018-12-20 16:27:26 -08:00
Bo Yang
f8fc10df1c Revert change to map_lite_test.proto 2018-12-20 15:59:06 -08:00
Bo Yang
624a40a387 Down-integrate internal changes to github. 2018-12-20 14:21:20 -08:00
Aaron Bray
424308216a Add strtod to libprotobuf-lite 2018-12-20 14:13:57 -05:00
Hao Nguyen
043b99c74a
Merge pull request #5492 from haon4/master
Add conformance test for allow_alias with lower_case enums
2018-12-19 16:27:48 -08:00
Paul Yang
71fc8b4b25
Update kokoro badges for python tests (#5495) 2018-12-19 16:08:57 -08:00
Hao Nguyen
e24d9a8aba Add dependency to AliasedEnum in PHP 2018-12-19 15:48:57 -08:00
Hao Nguyen
3c547fcdf3 Lower the severity of lower-case ruby enum to warning. Add conformance test for allow_alias with lower_case enums 2018-12-19 11:25:53 -08:00
Adam Cozzette
c4fb353fc8
Merge pull request #5479 from schroederc/cherry-pick-zlib
Cherry-pick zlib Bazel support
2018-12-19 11:15:04 -08:00
Hao Nguyen
b0f6035fd4 Merge remote-tracking branch 'upstream/master' 2018-12-19 11:09:16 -08:00
Adam Cozzette
dd33adcb84 Updated Bazel workspace in examples/ to handle zlib dependency
To make this work, I created a symlink to the existing zlib.BUILD file.
Maybe there is a better way to do this, but this is at least a quick
workaround to fix the build.
2018-12-19 09:20:55 -08:00
Aaron Bray
8c9e0ff0f7 Use NoLocalStrtod for international compliance
Recieved errors pasing json files with decimal floats from European colleagues
2018-12-18 21:55:22 -05:00
Paul Yang
4dec4f9371
Rebuild python docker image (#5475)
* Rebuild python docker image

* Update docker image

* Change call to build_and_run_docker.sh

* Set up python tests for different versions

* Fix comments
2018-12-18 18:07:24 -08:00
Adam Cozzette
6dc1d4353f
Merge pull request #5470 from meteorcloudy/win_test
Exclude command_line_interface_unittest.cc in MSVC build
2018-12-18 17:57:06 -08:00
Yilun Chong
6adc3d74fb
Fix benchmark to use docker image on kokoro (#5481)
* Fix benchmark to use docker image on kokoro

* Deleted pure php benchmark and fix long time benchmark
2018-12-18 16:20:23 -08:00
Adam Cozzette
cbf89a647a
Merge pull request #5488 from acozzette/unused-kokoro
Removed Kokoro config for 64-bit Linux
2018-12-18 15:28:38 -08:00
Adam Cozzette
453274b72d Removed Kokoro config for 64-bit Linux
This Kokoro configuration is no longer being used and the build.sh
script does not work anymore, so let's delete this configuration.
2018-12-18 14:57:46 -08:00
Paul Yang
d7c4409589
Php 7.3 fix (#5434)
* Inherit from message instead of implement

When regestering class (implmenets other class) during MINIT, zend_class_implements
would call zend_class_entry->interface_gets_implemented(). In PHP-7.3 interface_gets_implemented shares the same location with create_object.
However, during MINIT, the global object storeage hasn't been initialized. And thus, caused segment fault in php 7.3.

* Use zend_string_init where interned string may be the value.
zend_string_dup will keep using the existing interned string.
In php 7.3, interned string cannot be destroyed from user's code.

* Uncommment debug code

* Use latest phpunit for each php versions

* Revert change in Dockerfile

* Update php test to use the new docker image

* Update composer

* Change docker organization

* Update phpunit

* Debug phpunit

* Store phpunit into bin dir in docker image

* Install valgrind to docker

* Fix compatibility test

* Remove generated_service_test from compatibility c extension test

* Update 32bit php test to the new docker image

* Install bison

* Fix build.sh

* Fix DOCKERIMAGE_PREFIX

* Fix basename

* Add comment to build_and_run_docker2.sh

* Remove commented code

* Fix comments
2018-12-18 10:57:03 -08:00
Thomas Van Lenten
d529720e2f If enum aliases overlap in ObjC names skip generating the extras.
Some protos have enum values of "FOO" and "Foo", which the ObjC generation
then makes into the same thing. Just skip generating the enum element for
the duplicate as it would be a compile error because of the name collision.

The descriptors are still generated to support reflection and TextFormat
more completely.
2018-12-18 08:11:58 -05:00
Thomas Van Lenten
4c559316e0 Small fix to -[GPBEnumDescriptor getValue:forEnumTextFormatName:]
Don't look up the TextFormat for the value as aliases can trip that
up, instead check the TextFormat names directly and then fetch the
value.
2018-12-18 08:11:58 -05:00
Cody Schroeder
21c3801369 Add Bazel config for zlib support (#5389)
* Add Bazel config for optional zlib support

* Add hard dependency on zlib

* Remove unused config_setting
2018-12-17 10:29:36 -08:00
Hao Nguyen
c11096c10d Do not require Ruby enum to be upper case 2018-12-14 17:06:36 -08:00
Hao Nguyen
37dbfd6c46 Do not require ruby enum to be uppercase 2018-12-14 17:06:11 -08:00
Hao Nguyen
00b9b2303c Add conformance test for enum alias with same name but different case 2018-12-14 16:48:06 -08:00
Hao Nguyen
a6d624ba44 Merge branch 'master' of https://github.com/haon4/protobuf 2018-12-14 16:41:49 -08:00
Hao Nguyen
3d46d8dfe4 Add conformance test for enum alias of the same name with different case 2018-12-14 16:41:44 -08:00
Paul Yang
cecba296b8
Down-integrate internal changes (#5467)
* Down-integrate internal changes

* Update generated code for php, objc and csharp.

* Add missing dependency in conformance_php
2018-12-14 16:05:03 -08:00
Hao Nguyen
f93cf5a3cf
Merge pull request #5471 from haon4/master
Replace update_version shell script with a python script
2018-12-14 15:46:21 -08:00
Hao Nguyen
4b02f652e0 Make sure to add a new line at the end of XML files 2018-12-14 15:10:11 -08:00
Hao Nguyen
9349e23827 Replace update_version shell script with a python script, which is much better at handling XML rewrite. Update the PHP version too. As part of rewrite, some XML file format will change a little, but the semantics is still the same so it should be okay. 2018-12-14 15:05:48 -08:00
Joshua Haberman
38abec80fc
Merge pull request #5469 from haberman/objc
ObjC compiler changes to allow for easier import
2018-12-14 07:29:13 -08:00
Yun Peng
073487b302 Exclude command_line_interface_unittest.cc in MSVC build 2018-12-14 12:53:36 +01:00
Josh Haberman
5eb34cd727 More fixes. 2018-12-13 18:02:04 -08:00
Josh Haberman
401db44e6a More fixes. 2018-12-13 17:48:52 -08:00
Josh Haberman
eff1a6a014 More fixes for import. 2018-12-13 16:29:34 -08:00
Hao Nguyen
e9ea200e71
Merge pull request #5468 from haon4/master
Use docker for csharp, java_compatibility, and python_compatibility.
2018-12-13 16:10:12 -08:00
Hao Nguyen
6cb87bd157 Use docker for csharp, java_compatibility, and python_compatibility. Remove prepare_build_linux_rc that is no longer needed. 2018-12-13 15:20:25 -08:00
Paul Yang
5518c016a7
Compile php source to enable openssl and add php7.3 support (#5466) 2018-12-13 14:45:34 -08:00
Dave MacLachlan
b6311767e6 Minimize amount of filepaths being copied into protos.
By putting the NSAssert behind a DEBUG flag we aren't copying filepaths
into release builds.
2018-12-13 08:53:50 -05:00
Adam Cozzette
a50008ffac
Merge pull request #5452 from acozzette/update-examples-workspace
Updated Bazel workspace in examples/ to handle zlib dependency
2018-12-12 21:56:17 -08:00
Hao Nguyen
15c30d72a4
Create a script to help update the version automatically (#5454)
* Create a script to help update the version automatically

* Update comment in the update_version script

* Update script to fix special handling for common.h and Makefile.am

* Revise update_version script to only update the other constants in common.h if it is a major release. Reset Makefile.am version to 17:0:0
2018-12-12 15:38:14 -08:00
Adam Cozzette
e03c0d22a7 Updated Bazel workspace in examples/ to handle zlib dependency
To make this work, I created a symlink to the existing zlib.BUILD file.
Maybe there is a better way to do this, but this is at least a quick
workaround to fix the build.
2018-12-11 16:52:50 -08:00
Josh Haberman
9851c703ae Rename StringPieceTrimWhitespace() for rewriting purposes. 2018-12-11 16:43:05 -08:00
Hao Nguyen
52fee0e8f0
Merge pull request #5445 from haon4/master
Make Protobuf compatible with C# 6
2018-12-11 14:19:38 -08:00
Paul Yang
1d90079873
Add composer config to Dockerfile (#5451) 2018-12-11 14:00:51 -08:00
Cody Schroeder
802d543173 Add Bazel config for zlib support (#5389)
* Add Bazel config for optional zlib support

* Add hard dependency on zlib

* Remove unused config_setting
2018-12-11 11:58:26 -08:00
Paul Yang
8bd1542980
Add docker file for php testing. (#5447) 2018-12-10 16:32:56 -08:00