Commit Graph

4336 Commits

Author SHA1 Message Date
Paul Yang
7f3e237071 Merge 3.2.x branch into master (#2648)
* Down-integrate internal changes to github.

* Update conformance test failure list.

* Explicitly import used class in nano test to avoid random test fail.

* Update _GNUC_VER to use the correct implementation of atomic operation
on Mac.

* maps_test.js: check whether Symbol is defined before using it (#2524)

Symbol is not yet available on older versions of Node.js and so this
test fails with them. This change just directly checks whether Symbol is
available before we try to use it.

* Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up

* Updated Makefile.am to fix out-of-tree builds

* Added Bazel genrule for generating well_known_types_embed.cc

In pull request #2517 I made this change for the CMake and autotools
builds but forgot to do it for the Bazel build.

* Update _GNUC_VER to use the correct implementation of atomic operation on Mac.

* Add new js file in extra dist.

* Bump version number to 3.2.0

* Fixed issue with autoloading - Invalid paths (#2538)

* PHP fix int64 decoding (#2516)

* fix int64 decoding

* fix int64 decoding + tests

* Fix int64 decoding on 32-bit machines.

* Fix warning in compiler/js/embed.cc

embed.cc: In function ‘std::string CEscape(const string&)’:
embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   for (int i = 0; i < str.size(); ++i) {
                                ^

* Fix include in auto-generated well_known_types_embed.cc

Restore include style fix (e3da722) that has been trampled by
auto-generation of well_known_types_embed.cc

* Fixed cross compilations with the Autotools build

Pull request #2517 caused cross compilations to start failing, because
the js_embed binary was being built to run on the target platform
instead of on the build machine. This change updates the Autotools build
to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for
the build machine and always use that when building js_embed.

* Minor fix for autocreated object repeated fields and maps.

- If setting/clearing a repeated field/map that was objects, check the class
  before checking the autocreator.
- Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated
  classes to ensure there is less chance of issues if someone does something
  really crazy threading wise.
- Some more tests for the internal AutocreatedArray/AutocreatedDictionary
  classes to ensure things are working as expected.
- Add Xcode 8.2 to the full_mac_build.sh supported list.

* Fix generation of extending nested messages in JavaScript (#2439)

* Fix generation of extending nested messages in JavaScript

* Added missing test8.proto to build

* Fix generated code when there is no namespace but there is enum definition.

* Decoding unknown field should succeed.

* Add embed.cc in src/Makefile.am to fix dist check.

* Fixed "make distcheck" for the Autotools build

To make the test pass I needed to fix out-of-tree builds and update
EXTRA_DIST and CLEANFILES.

* Remove redundent embed.cc from src/Makefile.am

* Update version number to 3.2.0-rc.1 (#2578)

* Change protoc-artifacts version to 3.2.0-rc.1

* Update version number to 3.2.0rc2

* Update change logs for 3.2.0 release.

* Update php README

* Update upb, fixes some bugs (including a hash table problem). (#2611)

* Update upb, fixes some bugs (including a hash table problem).

* Ruby: added a test for the previous hash table corruption.

Verified that this triggers the bug in the currently released
version.

* Ruby: bugfix for SEGV.

* Ruby: removed old code for dup'ing defs.

* Reverting deployment target to 7.0 (#2618)

The Protobuf library doesn’t require the 7.1 deployment target so
reverting it back to 7.0

* Fix typo that breaks builds on big-endian (#2632)

* Bump version number to 3.2.0
2017-01-31 09:17:32 -08:00
Joshua Haberman
9d3288e651 Merge pull request #2226 from kchodorow/master
Create paths for external repositories in a way that is forward and backward compatible
2017-01-30 13:45:34 -08:00
Jon Skeet
afc59ab55a C#: Implement IReadOnlyList<T> in RepeatedField<T>
We explicitly don't do this when targeting .NET 3.5, where the
interface doesn't exist.

No implementation is required, as we're already implementing
everything we need for IList<T>.
2017-01-30 18:58:56 +00:00
Jie Luo
87e4976ba4 Merge pull request #2639 from anandolee/master
Add Oneof custom options test
2017-01-28 15:31:43 -08:00
michaelpengcn
a83ac8663f fix compile error on centos in metadata.h for constructors. (#2599) 2017-01-27 16:40:53 -08:00
Paul Yang
a323f1e65d Oneof accessor should return the field name that is actually set. (#2631) 2017-01-27 13:17:54 -08:00
Jie Luo
ccb76fff44 Add Oneof custom options test 2017-01-27 11:52:32 -08:00
Jie Luo
5af0b547de Merge pull request #2619 from anandolee/master
Add python compatibility tests against v2.5.0
2017-01-27 10:18:35 -08:00
Jie Luo
1f09786229 Merge pull request #2633 from anandolee/jieluo_branch1
Allow OneofOptions to be extended in proto3.
2017-01-26 14:00:08 -08:00
Jie Luo
ea51149100 Add python compatibility tests against v2.5.0 amd run on Travis. 2017-01-26 11:05:16 -08:00
Jie Luo
c15217f922 Allow OneofOptions to be extended in proto3. 2017-01-25 16:22:15 -08:00
Thomas Van Lenten
c2a5669773 Merge pull request #2626 from sergiocampama/8_3
Adds nullability modifiers to resolve Xcode 8.3 warnings

Fixes #2625
2017-01-25 17:45:17 -05:00
Kristina Chodorow
4e7ecde15c Update genfiles paths to work with a different execroot arrangement
Bazel is changing the way the execution root is organized (see https://github.com/bazelbuild/bazel/issues/1681
for details) and this updates the protobuf path logic to work with both old
and new versions of Bazel.
2017-01-25 14:10:56 -05:00
Sergio Campama
3d7b42d1a6 Adds nullability modifiers to resolve Xcode 8.3 warnings 2017-01-25 11:58:17 -05:00
Jie Luo
140e28d12e Add python compatibility tests against v2.5.0: copy tests and proto files from v2.5.0 2017-01-23 15:05:19 -08:00
Adam Cozzette
0aa5af3e68 Merge pull request #2614 from acozzette/gzip-output-stream-options
Set LIBPROTOBUF_EXPORT on GzipOutputStream::Options
2017-01-23 09:51:29 -08:00
Adam Cozzette
a101fa5289 Set LIBPROTOBUF_EXPORT on GzipOutputStream::Options
This fixes issue #2610.
2017-01-20 15:39:34 -08:00
Jon Skeet
047575f20c Support custom options in C#
This consists of:
- Changing the codegen for the fixed set of options protos, to parse unknown fields instead of skipping them
- Add a new CustomOptions type in the C# support library
- Expose CustomOptions properties from the immutable proto wrappers in the support library

Only single-value options are currently supported, and fetching options values requires getting the type right
and knowing the field number. Both of these can be addressed at a later time.

Fixes #2143, at least as a first pass.
2017-01-19 06:46:04 +00:00
Thomas Van Lenten
eed9951991 Merge pull request #2591 from thomasvl/objc_timestamps_take2
Timestamp helper fix, Duration helper cleanup.
2017-01-17 10:10:17 -05:00
Thomas Van Lenten
d0bc096b4a Timestamp helper fix, Duration helper cleanup.
- The Timestamp proto does not allow for negative nanos fields, so the seconds
  must be shifted and a positive nanos then applied.
- Tweak the helpers on Duration to make it clear there is no "base" time
  involved.
- Update the unittests for duration and timestamp to cover positive and
  negative NSTimeIntervals and what their impact is on the protos.
2017-01-12 19:33:25 -05:00
Thomas Van Lenten
c9cd6acd71 Merge pull request #2587 from google/revert-2586-objc_timestamp
Revert "Fix Timestamps with dates before the Unix epoch that contain fractional seconds."
2017-01-12 16:01:12 -05:00
Thomas Van Lenten
1651342501 Revert "Fix Timestamps with dates before the Unix epoch that contain fractional seconds." 2017-01-12 16:00:13 -05:00
Thomas Van Lenten
cf477d46ca Merge pull request #2586 from thomasvl/objc_timestamp
Fix Timestamps with dates before the Unix epoch that contain fractional seconds.
2017-01-12 15:50:59 -05:00
Thomas Van Lenten
adcccd0f81 Fix Timestamps with dates before the Unix epoch that contain fractional seconds.
The Timestamp proto does not allow for negative nanos fields, so the seconds must be shifted and
a positive nanos then applied.
2017-01-12 15:46:50 -05:00
Feng Xiao
feb78fb293 Merge pull request #2584 from cgrushko/patch-2
Add a proto_lang_toolchain for Java
2017-01-12 10:55:27 -08:00
cgrushko
e4baf3f58a Add a proto_lang_toolchain for Java
This allows easy use of Bazel's java_proto_library native rule.
2017-01-12 12:51:04 -05:00
Adam Cozzette
e53dd99350 Merge pull request #2529 from wackoisgod/master
Class deprecation support
2017-01-12 08:32:36 -08:00
Andrew Spiering
75ac3973ef Fixing code formatting issues 2017-01-11 11:18:53 -08:00
Andrew Spiering
effcb132e1 Merge branch 'master' of https://github.com/wackoisgod/protobuf 2017-01-11 10:52:21 -08:00
Adam Cozzette
228d242c58 Merge pull request #2567 from acozzette/distcheck-fix
Fixed "make distcheck" for the Autotools build
2017-01-10 12:54:06 -08:00
Jon Skeet
fb71df9f0b Add ByteString.FromStream and ByteString.FromStreamAsync in C#
Fixes #2088.

We now have separate tests for netcoreapp and net45 to test the two branches here.
(netstandard10 doesn't have MemoryStream.GetBuffer)

Although most of this library doesn't have any async functionality,
this feels like a natural place to locally add it.
2017-01-10 13:05:27 +00:00
Jon Skeet
e76d91a9d1 Add global.json file to pick dotnet core SDK version. 2017-01-10 13:05:27 +00:00
Adam Cozzette
0bdf4a617f Fixed "make distcheck" for the Autotools build
To make the test pass I needed to fix out-of-tree builds and update
EXTRA_DIST and CLEANFILES.
2017-01-09 09:38:14 -08:00
Sufir
2bddffc993 PHP fix int64 decoding (#2516)
* fix int64 decoding

* fix int64 decoding + tests
2017-01-08 11:50:50 -08:00
Marcus Longmuir
2c16f6979a Fix generation of extending nested messages in JavaScript (#2439)
* Fix generation of extending nested messages in JavaScript

* Added missing test8.proto to build
2017-01-06 16:59:47 -08:00
Joshua Haberman
ffa71f8007 A few more cases for binary conformance tests. (#2500)
* A few more cases for binary conformance tests.

* over-encoded varints (encoded in more bytes than are necessary).
* truncated varints (>32 bits for 32-bit types).

* Fixed Python decoding bug with 32-bit varints.

* Fixed 1L -> 1LL for 32-bit platforms.
2017-01-06 16:58:21 -08:00
Adam Cozzette
1041710fce Merge pull request #2565 from acozzette/cross-compilation
Fixed cross compilations with the Autotools build
2017-01-05 15:28:37 -08:00
Thomas Van Lenten
24f0d5691e Merge pull request #2563 from thomasvl/autocreator_tweaks
Minor fix for autocreated object repeated fields and maps.
2017-01-05 10:26:22 -05:00
Thomas Van Lenten
988ffe0a78 Minor fix for autocreated object repeated fields and maps.
- If setting/clearing a repeated field/map that was objects, check the class
  before checking the autocreator.
- Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated
  classes to ensure there is less chance of issues if someone does something
  really crazy threading wise.
- Some more tests for the internal AutocreatedArray/AutocreatedDictionary
  classes to ensure things are working as expected.
- Add Xcode 8.2 to the full_mac_build.sh supported list.
2017-01-05 09:15:40 -05:00
Adam Cozzette
2deb139bc9 Merge pull request #2544 from tiziano88/master
Add link to Elm proto plugin
2017-01-04 16:09:41 -08:00
Adam Cozzette
17a8a7619a Merge pull request #2536 from jbrianceau/fix-js-embed-include-style
Fix include in auto-generated well_known_types_embed.cc
2017-01-04 15:08:41 -08:00
Adam Cozzette
c55175cb9f Merge pull request #2564 from acozzette/arena-nc
Removed arena_nc.cc and arena_nc_test.py
2017-01-04 14:17:28 -08:00
Adam Cozzette
a59205215a Removed arena_nc.cc and arena_nc_test.py
This test is undocumented and it looks like it has probably never
worked. Let's just remove it to tidy things up. This fixes issue #2515.
2017-01-04 13:57:11 -08:00
Adam Cozzette
b40d318650 Fixed cross compilations with the Autotools build
Pull request #2517 caused cross compilations to start failing, because
the js_embed binary was being built to run on the target platform
instead of on the build machine. This change updates the Autotools build
to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for
the build machine and always use that when building js_embed.
2017-01-03 13:14:39 -08:00
NicklasWallgren
4cb113a91b Fixed issue with autoloading - Invalid paths (#2538) 2016-12-28 13:33:36 -08:00
Tiziano Santoro
30250cde5e Add link to Elm proto plugin 2016-12-28 01:02:12 +00:00
Feng Xiao
5f65ee6ac7 Merge pull request #2542 from jbrianceau/fix-embed-cc-warning
Fix warning in compiler/js/embed.cc
2016-12-27 11:00:46 -08:00
Julien Brianceau
4455cdf7ee Fix include in auto-generated well_known_types_embed.cc
Restore include style fix (e3da722) that has been trampled by
auto-generation of well_known_types_embed.cc
2016-12-27 11:50:46 +01:00
Julien Brianceau
05b019aedc Fix warning in compiler/js/embed.cc
embed.cc: In function ‘std::string CEscape(const string&)’:
embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   for (int i = 0; i < str.size(); ++i) {
                                ^
2016-12-27 09:59:52 +01:00
Adam Cozzette
f52e188fe4 Merge pull request #2523 from jbrianceau/init-index-in-metadata
Init index_in_metadata_ without condition
2016-12-22 12:56:08 -08:00