Commit Graph

3281 Commits

Author SHA1 Message Date
Jon Skeet
261fde1707 Merge pull request #1326 from the-alien/csharp_json_name
csharp: add support for the json_name option
2016-03-30 09:11:59 +01:00
alien
af34538aca Merge branch 'master' of https://github.com/google/protobuf into csharp_json_name 2016-03-29 20:58:23 +03:00
alien
6f8dd2115b Code review fixes 2016-03-29 20:56:32 +03:00
Thomas Van Lenten
261ee021f6 Merge pull request #1358 from thomasvl/travis_tweaks
Mark iOS tests as able to fail.
2016-03-29 11:55:04 -04:00
Thomas Van Lenten
8d47d7873e Mark iOS tests as able to fail.
Travis updated their images to include an xctool that can randomly kill
tests, so mark them as flaky to avoid turning things red.
2016-03-29 09:21:50 -04:00
Thomas Van Lenten
9240acd179 Merge pull request #1350 from thomasvl/over_release
The message was autoreleased, the -releases are an over release.
2016-03-24 15:28:53 -04:00
Thomas Van Lenten
3f917447e7 The message was autoreleased, the -releases are an over release. 2016-03-24 15:25:21 -04:00
Feng Xiao
812691227d Merge pull request #1345 from smparkes/smparkes/well-known-protos
export well known protos
2016-03-23 11:36:00 -07:00
Steven Parkes
d5a573274d export well known protos 2016-03-22 17:56:07 -07:00
Feng Xiao
34eeeff640 Merge pull request #1344 from topillar/patch-1
Update coded_stream.h
2016-03-22 10:19:42 -07:00
topillar
64dfb5f80a Update coded_stream.h
fix warning treated as error prevents building on 64-bit windows.
2016-03-22 23:45:41 +08:00
Feng Xiao
698fa8ee22 Merge pull request #1335 from pradeepg26/master
Allow custom URLs for Any in JsonFormat
2016-03-21 11:32:00 -07:00
Thomas Van Lenten
92091363cd Merge pull request #1339 from thomasvl/delay_dispatch_semaphore_creation
Only create the readonlySemaphore on demand.
2016-03-21 13:57:14 -04:00
Thomas Van Lenten
bd41a39f69 Only create the readonlySemaphore on demand.
This will lower the amount of dispatch_semaphores created per Message when the
full object tree isn't walked in a way that would require them to be created.
Uses a dispatch_once_t for one time init of the dispatch_semaphore.
2016-03-21 11:11:14 -04:00
Pradeep Gollakota
4d98369f6d Allow custom URLs for Any in JsonFormat
- Using custom URL for types in Any will no longer throw an
InvalidProtocolBufferException in JsonFormat
- Fixes #1128
2016-03-18 23:06:14 -07:00
alien
0d32ab37fa csharp: add support for the json_name option
Conflicts:
	csharp/src/Google.Protobuf/JsonFormatter.cs
2016-03-18 22:59:50 +03:00
Thomas Van Lenten
5e933847cc Merge pull request #1325 from thomasvl/shrink_overhead
Shrink ObjC overhead (generated size and some runtime sizes)
2016-03-17 17:06:33 -04:00
Thomas Van Lenten
79a23c435c Shrink ObjC overhead (generated size and some runtime sizes)
NOTE: This is a binary breaking change as structure sizes have changed size
and/or order.

- Drop capturing field options, no other options were captured and other mobile
  targeted languages don't try to capture this sort information (saved 8
  bytes for every field defined (in static data and again in field descriptor
  instance size data).
- No longer generate/compile in the messages/enums in descriptor.proto. If
  developers need it, they should generate it and compile it in. Reduced the
  overhead of the core library.
- Compute the number of has_bits actually needs to avoid over reserving.
- Let the boolean single fields store via a has_bit to avoid storage, makes
  the common cases of the instance size smaller.
- Reorder some flags and down size the enums to contain the bits needed.
- Reorder the items in the structures to manually ensure they are are packed
  better (especially when generating 64bit code - 8 bytes for every field,
  16 bytes for every extension, instance sizes 8 bytes also).
- Split off the structure initialization so when the default is zero, the
  generated static storage doesn't need to reserve the space. This is batched
  at the message level, so all the fields for the message have to have zero
  defaults to get the saves. By definition all proto3 syntax  files fall into
  this case but it also saves space for the proto2 that use the standard
  defaults. (saves 8 bytes of static data for every field that had a zero
  default)
- Don't track the enums defined by a message. Nothing in the runtime needs it
  and it was just generation and runtime overhead. (saves 8 bytes per enum)
- Ensure EnumDescriptors are started up threadsafe in all cases.
- Split some of the Descriptor initialization into multiple methods so the
  generated code isn't padded with lots of zero/nil args.
- Change how oneof info is feed to the runtime enabling us to generate less
  static data (8 bytes saved per oneof for 64bit).
- Change how enum value informat is capture to pack the data and only decode
  it if it ends up being needed. Avoids padding issues causing bloat of 64bit,
  and removes the needs for extra pointers in addition to the data (just the
  data and one pointer now).
2016-03-17 10:04:21 -04:00
Feng Xiao
ca3dc15d4c Merge pull request #1318 from smparkes/smparkes/grpc
add java/util support based on java/util/pom.xml
2016-03-14 14:57:33 -07:00
Thomas Van Lenten
44fdead9d2 Merge pull request #1291 from sergiocampama/devel
Adds more information to Objective C error.
2016-03-14 10:07:05 -04:00
Jisi Liu
9aea0ef0cd Merge pull request #1312 from petewarden/master
Bazel iOS build settings
2016-03-12 15:15:03 -08:00
Steven Parkes
a9244ca0df add java/util support based on java/util/pom.xml 2016-03-11 18:08:09 -08:00
Jisi Liu
c71f1847c8 Merge pull request #1278 from smparkes/master
pass correct args to protoc for wellknown protos when used as an external repository
2016-03-11 16:58:15 -08:00
Feng Xiao
dfaf1aac30 Merge pull request #1317 from benvanik/patch-1
Fixing compilation error when building with emscripten.
2016-03-11 12:10:06 -08:00
Ben Vanik
58f07644ea Fixing compilation error when building with emscripten.
This change was previously done in //third_party in CL 108656107 but never made it to the open source project and was overwritten in an update.
2016-03-11 09:19:58 -08:00
Steven Parkes
ea1886661e pass correct args to protoc for java wellknown protos when used as an external repository 2016-03-10 15:04:46 -08:00
Pete Warden
bc2d6c2504 Merge remote-tracking branch 'upstream/master' 2016-03-09 13:05:15 -08:00
Pete Warden
f0c1a86372 Added iOS settings to Bazel build 2016-03-09 13:03:52 -08:00
Feng Xiao
48ebb29a8e Merge pull request #1299 from tatraian/master
Fix compiling clang/libc++ builds. (Issue: #1266)
2016-03-08 11:15:24 -08:00
Antal Tátrai
e2fb1d9822 Comment has been added to fix (issue #1266) 2016-03-08 20:01:42 +01:00
Thomas Van Lenten
a8db268d8f Merge pull request #1309 from thomasvl/leading_special_prop_names
Fix up handing of fields with leading names that should be all caps.
2016-03-08 09:30:37 -05:00
Thomas Van Lenten
1bf4b38f29 Fix up handing of fields with leading names that should be all caps.
Add a compile test to confirm things are working as expected.
2016-03-08 09:29:49 -05:00
Joshua Haberman
3dd3238189 Merge pull request #1306 from silviulica/master
Update version to 3.0.0b2.post2
2016-03-07 16:31:48 -08:00
Silviu Calinoiu
4573edba76 Update version to 3.0.0b2.post2 2016-03-07 14:33:57 -08:00
Thomas Van Lenten
6a8815bef9 Merge pull request #1304 from thomasvl/headerdocs
HeaderDoc support in the library and generated sources
2016-03-07 15:11:18 -05:00
Thomas Van Lenten
36650a07cf HeaderDoc support in the library and generated sources
- Convert most of the core library headers over to HeaderDoc format.
- Switch the generated comments over to HeaderDoc.
- Create GPBCodedOutputStream_PackagePrivate and move some things into there
  that should be more internal.
2016-03-07 12:07:03 -05:00
Jon Skeet
f2d3408676 Merge pull request #1301 from avgweb/master
Replace StringBuilder with TextWriter in JsonFormatter
2016-03-07 09:37:43 +00:00
avgweb
ad2d775e1b Replace StringBuilder with TextWriter in JsonFormatter 2016-03-06 17:50:02 -08:00
Joshua Haberman
9242d9b7f4 Merge pull request #1298 from craigcitro/fix_setup
Add back the namespace_packages arg in setup.py.
2016-03-05 13:33:24 -08:00
Antal Tátrai
3cc35adb6d Fix compiling clang/libc++ builds. (Issue: #1266) 2016-03-05 09:32:59 +01:00
Craig Citro
0e7c0c2fb8 Add back the namespace_packages arg in setup.py.
Improves #1296.

The problem: in the previous patch, we tweaked the __init__.py files to use
namespaces, but no longer declared ourselves as a namespace package. The
second half was unwise.

Note that this only comes up when installing protobuf alongside another
package that also installs into the google namespace; as of right now, the
only PyPI package that does is googleapis-common-protos, though the GAE SDK
also uses google.appengine. Installing either or both of those alongside this
package now works.

The case that still remains is the upgrade path, which is also what worried me
in #713. It seems that if protobuf 2.6.1 is installed, there's no way to
safely upgrade that to work with a newer protobuf. However, `pip uninstall` &&
`pip install` does the trick.
2016-03-05 00:10:11 -08:00
Joshua Haberman
e70f9256af Merge pull request #1139 from haberman/rubyjsoncamel
Changed Ruby to properly camelCase its JSON by default.
2016-03-04 17:31:11 -08:00
Joshua Haberman
37663e861b Merge pull request #1292 from haberman/ruby-allow-descriptor
Generate well-known types in Ruby extension and prune unneeded proto2 dependencies.
2016-03-04 13:09:25 -08:00
Josh Haberman
35227b4f31 Removed the generated Ruby file from Makefile.am. 2016-03-03 23:52:31 -08:00
Josh Haberman
513875da77 Generate well-known types in Ruby extension and prune unneeded proto2 dependencies. 2016-03-03 14:08:54 -08:00
Sergio Campama
b5a35b4411 Adds more information to Objective C error when the expected objc_class_prefix option is missing. 2016-03-03 16:49:53 -03:00
Paul Yang
78105897a8 Merge pull request #1260 from legrosbuffle/master
Make cpp generated enum constants constexpr when Options::proto_h is specified
2016-03-02 10:16:20 -08:00
Jon Skeet
584233bd04 Merge pull request #1287 from jskeet/fix-typo
Fix copy/paste typo in CodedInputStreamTest
2016-03-01 07:53:27 +00:00
Jon Skeet
f222a9a5e6 Fix copy/paste typo in CodedInputStreamTest 2016-03-01 07:30:40 +00:00
Joshua Haberman
52f62e3652 Merge pull request #1274 from murgatroid99/node_relative_requires
Fix CommonJS relative require generation, and test it
2016-02-29 10:09:56 -08:00