Commit Graph

3982 Commits

Author SHA1 Message Date
mike07026
df6088a7e8 detect invaild JSON encoding in bytes field 2016-09-01 20:08:45 +08:00
mike07026
5a17660ca0 detect invaild JSON encoding in bytes field 2016-09-01 20:06:55 +08:00
mike07026
e514f232a0 fix #1342 cause by ownership issues 2016-09-01 09:04:24 +08:00
Wei-Yin Chen (陳威尹)
48811b2edd Fix Win32ErrorMessage on Unicode build 2016-08-31 17:28:51 -07:00
Wei-Yin Chen (陳威尹)
11d6cb56d0 Add test for Win32ErrorMessage 2016-08-31 17:28:51 -07:00
Wei-Yin Chen (陳威尹)
588a803d58 Support Unicode build on Windows 2016-08-31 17:28:51 -07:00
Feng Xiao
b9649765f8 Merge pull request #2024 from pstavirs/master
Restore New*Callback into google::protobuf namespace …
2016-08-31 11:39:38 -07:00
Feng Xiao
52e491b3bb Use 64-bit protoc binaries in compatibility tests.
Turns out travis doesn't have the library dependencies to run a 32-bit
binary.

Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81
2016-08-31 11:36:37 -07:00
Khing
8ee6f568ea Remove unused vector 2016-08-31 15:12:32 +10:00
Brendan Ribera
de028631fc fix #2036: use rb_hash_* to accumulate hashes
Instead of shifting/xoring the hash at each field, use the built-in ruby
apis for generating a hash from multiple input values.

Now returns a Fixnum.
2016-08-30 16:22:49 -07:00
Brendan Ribera
047419a172 failing test for #2036:
* add a repeated field to the tested hash
* also assert that two messages with identical values produce identical hashes
2016-08-30 16:21:33 -07:00
Feng Xiao
c0a6a6b462 Merge pull request #2033 from frett/osgiExport
update the OSGi metadata for the javanano package
2016-08-30 10:31:45 -07:00
Daniel Frett
b6dec9b8d4 update the OSGi SymbolicName and ExportedPackage for the javanano library 2016-08-30 13:16:55 -04:00
Joshua Haberman
dd45c0b9fd Merge pull request #2012 from haberman/rubymapgcfix
Ruby: make sure map parsing frames are GC-rooted.
2016-08-30 09:57:50 -07:00
Thomas Van Lenten
8c93606357 Merge pull request #2031 from thomasvl/dont_require_filegenerators
Speed up ObjC Generation with large dependency trees
2016-08-30 12:19:40 -04:00
Thomas Van Lenten
78a6d310de Speed up ObjC Generation with large dependency trees
Don't create FileGenerators for each dep. FileGenerators will deeply create all
the message, enum, and field generators; but those aren't needed when doing
the imports for dependencies. Instead directly generate the imports off the
FileDescriptors so no extra objects are created. The only other use was when
chaining together the *Roots for the file extension registry, but that also
can be generate off the name of the FileDescriptor directly.
2016-08-30 10:51:59 -04:00
Joshua Haberman
e721ce66cf Merge pull request #2012 from haberman/rubymapgcfix
Ruby: make sure map parsing frames are GC-rooted.
2016-08-29 17:05:43 -07:00
Guillaume Egles
8335b7d93e Fix missing import of jspb.Map (#1885) 2016-08-29 16:30:48 -07:00
Josh Haberman
3a674ffe05 upb bugfix: JSON map entry keys were passing the wrong closure. 2016-08-29 15:28:59 -07:00
Srivats P
eedc7be680 Restore New*Callback into google::protobuf namespace since these are used by the service stubs code
Fixes #1966
2016-08-29 22:57:46 +05:30
Joshua Haberman
7e627738b3 Merge pull request #1920 from gegles/master
Fix missing import of jspb.Map (#1885)
2016-08-29 10:07:25 -07:00
Thomas Van Lenten
c32b9dd474 Merge pull request #2018 from thomasvl/support_generate_all
ObjC support for GenerateAll().
2016-08-29 11:55:08 -04:00
Zi Shen Lim
f5c7a4896d benchmarks: update readme.txt
Remove references to google_speed.proto which was removed in
commit 2e83110230.

Also fix-up commands to build and run.
2016-08-26 18:11:44 -07:00
Jisi Liu
4fd4471de2 Merge pull request #2014 from pherl/fixgmock
Change autogen.sh to download the zip from github
2016-08-26 14:54:44 -07:00
Thomas Van Lenten
2e66a61b54 Support GenerateAll().
- Expect calls on GenerateAll() and not Generate().
- Parse the prefix validation file once, and then check all the files.
2016-08-26 13:54:00 -04:00
Feng Xiao
1760feb621 Update gmock links.
The original link is no longer available.

Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07
2016-08-26 09:42:33 -07:00
Feng Xiao
1e6dc7d2c3 Update links in appveyor.yml
Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1
2016-08-26 09:42:33 -07:00
Josh Haberman
d4213d839f Ruby: make sure map parsing frames are GC-rooted. 2016-08-26 09:03:55 -07:00
Feng Xiao
3d9d1a1255 Merge pull request #2013 from xfxyjwf/gmock
Update gmock links.
2016-08-25 20:09:20 -07:00
Feng Xiao
c4a84abcb6 Update links in appveyor.yml
Change-Id: I3d44e3c6877e00cfea5a903568fde1e6f597aac1
2016-08-25 14:34:45 -07:00
Feng Xiao
bba446bbf2 Update gmock links.
The original link is no longer available.

Change-Id: I2976d3f19c8e818689549fb31ff20af8eae92a07
2016-08-25 14:28:59 -07:00
Feng Xiao
08951c3c3a Merge pull request #2011 from tomas-abrahamsson/patch-1
Add an Erlang project, gpb, to third_party.md
2016-08-25 11:34:47 -07:00
Tomas Abrahamsson
4d04fcdaf6 Add an Erlang project, gpb, to third_party.md 2016-08-25 15:11:45 +02:00
Joshua Haberman
b97a4a53cd Merge pull request #2001 from nicolasnoble/patch-1
Fixing regular expression...
2016-08-24 10:40:50 -07:00
Nicolas Noble
866d3e5327 Fixing regular expression...
This will allow loading the extension for Ruby 2.1.10...
2016-08-23 22:46:26 -07:00
Thomas Van Lenten
569d5ce65b Merge pull request #1997 from thomasvl/move_include_package_into_helpers
Move ImportWriter into helpers for sharing
2016-08-23 15:06:10 -04:00
Thomas Van Lenten
290d26b462 Remove the compiler options from ImportWriter.
Breaks the tie of the ImportWriter to the ObjC generation, allow grpc to use
a different extension and to relay the values they need for these.

- Pass in the two framework options to the ctor.
- Pass in the header extension to AddFile.
2016-08-23 11:19:38 -04:00
Thomas Van Lenten
93362a5aa5 Move the ImportWriter into the ObjC Helpers.
grpc likely needs to provide the same sorta handling, so expose the class so
the logic can be reused.
2016-08-23 10:19:03 -04:00
Thomas Van Lenten
80f65d2df8 Add note about JSON tests maybe being wrong. (#1992)
Add note about JSON tests maybe being wrong.

- Add note about the JSON test maybe not being correct yet.
- Add test to checks the generated names for double underscores to be sure they
  are what is expected.
2016-08-23 08:19:45 -04:00
Thomas Van Lenten
b5794ed024 Merge pull request #1984 from thomasvl/more_json_tests
More tests to shake out some cases in the json parsing
2016-08-22 15:37:25 -04:00
Thomas Van Lenten
7437774a27 More JSON tests
- String behaviors
- Testing only valid JSON is allowed
2016-08-22 12:07:33 -04:00
Sergio Campamá
ff2a6600e5 Adds better support for protos without packages (#1979)
Adds better support for protos without packages and more warnings on possible improvements
2016-08-19 09:35:33 -04:00
Feng Xiao
8b301451bc Add a jenkins test status badge.
[ci skip]

Change-Id: I5bf4f204e7ef0144d8fc984a985d502f92ce95ce
2016-08-18 10:34:44 -07:00
Thomas Van Lenten
45d04d0296 Merge pull request #1977 from thomasvl/bump_cocoapod_spec
Bump the version in prep for the 3.0.2 tag being cut
2016-08-18 08:32:20 -04:00
Thomas Van Lenten
584917fe84 Bump the version in prep for the 3.0.2 tag being cut
Also pull the watchos support info from master.
2016-08-17 16:53:14 -04:00
Thomas Van Lenten
564c02f5cb Merge pull request #1975 from pherl/cp
Cherry pick objc changes into 3.0.0-GA branch
2016-08-17 16:11:53 -04:00
Thomas Van Lenten
a877fdfafe Record zero for "has" for proto3 if in a oneof.
If a message is proto3, then the zero values still count as being set one the
field is in a oneof.

Add tests to confirm oneofs work as expected in both syntaxes.
2016-08-17 10:54:52 -07:00
Thomas Van Lenten
116596a4e6 Never use strlen on utf8 runs so null characters work.
Fixes https://github.com/google/protobuf/issues/1933

Add a new test that forces strings into two different implementations from the
NSString class cluster to help confirm we're exercising both paths by which
CodedOutputStream will extract data from an NSString.

Move the old +load test (that was flawed because the behavior really depends on
the type of string from the NSString class cluster); into a unittest that
targets the specific case we're adding a behavior confirmation on.

As a bonus, improve the TextFormat generation of string characters < 0x20.
2016-08-17 10:51:07 -07:00
Sergio Campamá
62f2ff86b5 Fixes extra whitespace on generated comments. (#1950)
Fixes extra whitespace on generated comments.
2016-08-17 10:50:58 -07:00
Sergio Campamá
a989501f47 Adds support for appledoc in generated code. (#1928)
Convert mapping of proto comments to appledoc format so they show up in Xcode and cocoadocs.

Fixes https://github.com/google/protobuf/issues/1866
2016-08-17 10:50:52 -07:00