Brendan Ribera
525c6327ab
Fix hash computation for JRuby's RubyMessage
...
`System.identityHashCode` returns a hash that does not consider a
Message's values. This means two Messages with identical values will not
have identical hashCodes.
This patch uses the pattern from RubyMap to combine the hashCodes from
all values in a given message and produce a unique, consistent,
value-based hash.
2016-09-22 00:18:12 +00:00
Bo Yang
b8e7e892c8
Fix travis, jenkins environment issues.
2016-09-21 22:56:47 +00:00
Adam Cozzette
050c014ac6
Added new has_bits.h file to cmake/extract_includes.bat.in ( #2152 )
...
This is necessary so that the CMake build knows to include this header
file in the installation include/ directory.
2016-09-21 10:40:26 -07:00
Adam Cozzette
f81d44fafa
Fixed quadratic behavior in JSPB deserialization of repeated fields ( #2117 ) ( #2146 )
...
Currently deserialization of a non-packed binary repeated field is quadratic in
the number of elements, because each time we parse a new element we copy over
all elements we have parsed so far. This CL fixes the performance problem by
having the generated deserialization code just call addX() instead of using
getX() and setX().
2016-09-21 10:39:23 -07:00
Bo Yang
b9bc9904c2
Fix bugs for csharp and ruby for internal integration.
2016-09-21 02:20:24 +00:00
Bo Yang
c8b9d41f99
Fix python bugs for internal integration.
2016-09-21 01:34:32 +00:00
Bo Yang
08e9f7011b
Bump library veriosn to 3.1
2016-09-21 00:38:58 +00:00
Bo Yang
22d7248c97
Fix bugs for internal integration.
2016-09-20 23:54:13 +00:00
Bo Yang
6cb6bd9f21
Fix gson dependency.
...
gson 2.3 has internal bug that it doesn't work with some versions of maven.
2016-09-20 22:04:48 +00:00
Bo Yang
ebcda12102
Bump version number to 3.1.0-alpha-1.
2016-09-20 21:37:06 +00:00
Joshua Haberman
679381fba8
Fix for maps_test.js in JavaScript. ( #2145 )
...
Had to strip out some JSPB-format test code,
but also added some .proto test messages that
had been improperly stripped out.
2016-09-20 13:56:18 -07:00
Bo Yang
a2c65011c3
Fix bugs for internal integration.
2016-09-19 20:40:58 -07:00
Thomas Van Lenten
0dca5a5bf9
Use a custom dictionary to avoid NSNumber operations.
...
For the secondary dictionary, use a custom CFDictionary with integer keys to
avoid the NSNumber conversions.
2016-09-19 17:43:19 -07:00
Thomas Van Lenten
96c469de68
Remove the custom key functions and just use the system provided defaults.
2016-09-19 17:43:19 -07:00
Bo Yang
98835fb8f8
Integrate internal changes
2016-09-19 17:42:40 -07:00
Joshua Haberman
b5bbdb0967
Merge pull request #2037 from abscondment/fix-2036-ruby-hash
...
Fix #2036 (Ruby `hash` broken for Messages with repeated fields.)
2016-09-18 21:38:51 -07:00
Feng Xiao
c44ca26fe8
Merge pull request #2130 from kilink/substring-comment-fix
...
Fix erroneous comment regarding String.substring
2016-09-16 17:07:57 -07:00
Patrick Strawderman
9ac84f8f3f
Fix erroneous comment regarding String.substring
...
Since Java 7, Strings produced with String.substring do not share byte arrays.
2016-09-16 14:54:58 -07:00
Bo Yang
3b001ca6ba
Some php engine implementation doesn't have return_value_ptr properly set. Explicitly use &return_value.
2016-09-15 17:59:49 -07:00
Bo Yang
c6fa9c71a5
Auto-generate proto files for tests.
2016-09-15 17:59:49 -07:00
Bo Yang
f174d36380
Add back missing test proto files.
2016-09-15 17:59:49 -07:00
Jisi Liu
9c4be5f654
Merge pull request #2112 from pherl/merge
...
Merge 3.0.x into master
2016-09-15 14:37:38 -07:00
Thomas Van Lenten
b4235ac79c
Merge pull request #2123 from thomasvl/objc_better_versioning_take2
...
Update the ObjC version checks to support a min and current version.
2016-09-15 17:36:08 -04:00
Thomas Van Lenten
1aa6500056
Update the ObjC version checks to support a min and current version.
...
- Capture the version used to generated.
- Check at compile time and runtime that generated code isn't from a newer
version, also check that the min version required is also supported.
- Keep the old constants/macros/functions to special case the last version
that was working so those generated sources still work until we decide
otherwise.
2016-09-15 17:22:51 -04:00
Paul Yang
e0e54661f7
Check in php implementation. ( #2052 )
...
This pull request includes two implementation: C extension and PHP
package. Both implementations support encode/decode of singular,
repeated and map fields.
2016-09-15 11:09:01 -07:00
Jisi Liu
58860c021f
Merge remote-tracking branch 'origin/3.0.x' into merge
2016-09-14 09:37:48 -07:00
Feng Xiao
86fcd879b3
Merge pull request #1765 from mbarbon/master
...
Add https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic
2016-09-12 20:45:28 -07:00
Feng Xiao
1affbd8717
Merge pull request #2021 from zlim/bench-fix
...
benchmarks: update readme.txt
2016-09-12 16:08:16 -07:00
Feng Xiao
4f032cd9af
Merge pull request #2100 from vladmos/patch-1
...
Compatibility with the new version of Bazel.
2016-09-12 10:02:39 -07:00
Feng Xiao
22e7fa6aef
Merge pull request #2092 from dprotaso/master
...
Allow the JsonFormat.Parser to ignore unknown fields
2016-09-12 09:53:27 -07:00
Vladimir Moskva
5caf516976
Resolved a conflict
2016-09-12 11:27:28 +02:00
Feng Xiao
78aee1b15f
Merge pull request #2044 from wychen/Win32ANSI
...
Fix Win32 error messages on Unicode build
2016-09-09 16:46:50 -07:00
Jisi Liu
643a02bc9c
Merge pull request #1636 from yugui/feature/generic-plugin
...
Generalize plugin support in Bazel Skylark rule
2016-09-09 15:00:25 -07:00
Feng Xiao
53387e5f55
Merge pull request #2090 from guoxiao/find
...
include std::find()
2016-09-09 12:44:34 -07:00
Feng Xiao
e90292b2a6
Merge pull request #2103 from adrianludwin/fix-gtest
...
Update repo in Bazel build files to use googletest instead of the deprecated gMock
2016-09-09 11:54:49 -07:00
Adrian Ludwin
1327e6f470
Update repo to use google test
2016-09-09 13:10:56 -04:00
Thomas Van Lenten
7377eb2b03
Merge pull request #1970 from thomasvl/objc_any_helpers
...
Objc any helpers
2016-09-09 11:02:09 -04:00
Vladimir Moskva
a86e6d8db2
Compatibility with the new version of Bazel.
...
Global variable HOST_CFG is deprecated and will not be supported soon.
2016-09-09 13:21:35 +02:00
Thomas Van Lenten
5d35e60900
Merge pull request #2094 from thomasvl/update_wkt_comments
...
Fix error and add note about lossy issues
2016-09-08 17:02:43 -04:00
Jisi Liu
57170b9343
Merge pull request #2096 from pherl/3.0.x
...
Cherry pick objc test changes into 3.0.x branch
2016-09-08 12:49:55 -07:00
Thomas Van Lenten
5699b920bf
More complete nil/reset tests within a oneof
2016-09-08 12:45:20 -07:00
Thomas Van Lenten
708296e583
Fix some constants to be correct for the message class in use.
2016-09-08 12:44:11 -07:00
Thomas Van Lenten
161b937740
Fix error and add note about lossy issues
2016-09-08 15:34:42 -04:00
Sergio Campamá
14e74f6a21
Support the -Wassign-enum compiler flag. ( #2085 )
...
Support the -Wassign-enum compiler flag.
2016-09-08 15:15:12 -04:00
Dave Protasowski
1fc416be21
Allow the JsonFormat.Parser to ignore unknown fields
...
The default behaviour of throwing an exception remains
2016-09-08 15:08:30 -04:00
Jisi Liu
a15df74146
Merge pull request #2087 from khingblue/fix-unused-param
...
Fix #2032 unused parameter 'deterministic'
2016-09-08 10:15:38 -07:00
Thomas Van Lenten
337ec3065f
Add ObjC helpers for Any WKT.
...
- Capture the ObjC prefix used when generating the the file.
- Track the containing type on descriptors.
- Mark descriptors where the message class name got a suffix added to it.
- Expose a fullName property on Descriptors.
- Add helpers for packing/unpacking Any messages.
- Bump the ObjC runtime version number. Since we added methods and invoke them
in the generated code, ensure the code is running against a matching version.
Otherwise, someone could compile against headers, but run with a framework
that is older and get unknown selector failures. This should trip clearer
messaging.
Fixes https://github.com/google/protobuf/issues/1674
2016-09-08 11:59:57 -04:00
Guo Xiao
82133ba00b
include std::find()
2016-09-08 21:33:18 +08:00
Khing
08b1c718e4
Fix #2032 unused parameter 'deterministic'
...
Parameter deterministic is unused in
InternalSerializeWithCachedSizesToArray(), which generates unused
parameter warning in every message.
2016-09-08 10:56:21 +10:00
Feng Xiao
4bc1657853
Merge pull request #2079 from khingblue/fix-generate-descriptor
...
Fix #2071 replacing /bin/sh with bash when generates descriptor
2016-09-07 14:56:31 -07:00