aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #1369 from jskeet/tools-nuspecJan Tattermusch2016-03-312-14/+37
|\ \ \ \ \ | |/ / / / |/| | | | Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms.
| * | | | Remove duplicate lineJon Skeet2016-03-311-1/+0
| | | | |
| * | | | Introduce a new nuget package, Google.Protobuf.Tools, basically to contain ↵Jon Skeet2016-03-312-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | protoc on multiple platforms. I've moved both protoc.exe and the proto files out of Google.Protobuf. The .proto files aren't a slam-dunk, but it feels like they belong with protoc as you'd *use* them with protoc. It's not clear to me whether we really need both an x86 and x64 version of protoc.exe, as x86 would work on 64-bit Windows anyway. Discuss :)
* | | | | Merge pull request #1371 from keveman/oversize_protosJoshua Haberman2016-03-312-11/+94
|\ \ \ \ \ | | | | | | | | | | | | Added an API to allow oversize protos when using C++ extension in Python
| * | | | | Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-312-11/+94
| | | | | |
* | | | | | Merge pull request #1366 from xyzzyz/int128_ostreamFeng Xiao2016-03-311-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Replace #include <iostream> with #include <ostream> in int128.cc
| * | | | | Replace #include <iostream> with #include <ostream>Adam Michalik2016-03-301-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | iostream is not actually necessary here, and it introduces unnecessary static initializers.
* | | | | Merge pull request #1362 from jskeet/tweak_json_nameJan Tattermusch2016-03-301-61/+39
|\ \ \ \ \ | |/ / / / |/| | | | Refactoring of FieldDescriptor
| * | | | Refactoring of FieldDescriptorJon Skeet2016-03-301-61/+39
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes no externally visible behavioral changes. Internally and non-behaviorally: - We use a field (compiler-generated) to store the JsonName to avoid recomputing it repeatedly - The documentation for JsonName is updated to reflect the meaning better - Readonly autoprops and expression-bodied properties used where possible
* | | | Merge pull request #1360 from pherl/masterJisi Liu2016-03-301-1/+1
|\ \ \ \ | | | | | | | | | | Use the T() instead of NULL for the default value.
| * | | | Use the T() instead of NULL for the default value.Jisi Liu2016-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The template can be specialized on primitives, e.g. double, where converting NULL will trigger a warning.
* | | | | Merge pull request #1295 from haberman/dockerJoshua Haberman2016-03-309-36/+448
|\ \ \ \ \ | |_|/ / / |/| | | | Add support for running on Jenkins
| * | | | Merge branch 'master' into dockerJosh Haberman2016-03-29101-6889/+4074
| |\| | |
| * | | | Rearranged and commented files for running under Jenkins.Josh Haberman2016-03-0411-140/+115
| | | | |
| * | | | Disable attempt to use ccache for docker build.Josh Haberman2016-03-033-20/+13
| | | | |
| * | | | Properly report C++ build time.Josh Haberman2016-03-033-8/+15
| | | | |
| * | | | Use a local Maven repository to avoid network fetches during tests.Josh Haberman2016-03-032-0/+31
| | | | |
| * | | | Make Java copy into separate directories so the tests can run concurrently.Josh Haberman2016-03-021-5/+9
| | | | |
| * | | | Added code to generate XML output file for more granular results.Josh Haberman2016-03-025-11/+122
| | | | |
| * | | | Added Ruby 2.1, Oracle Java, and C#.Josh Haberman2016-03-023-21/+76
| | | | |
| * | | | Upgrade Python packages using pip.Josh Haberman2016-03-021-1/+7
| | | | |
| * | | | Work around tox bug.Josh Haberman2016-03-021-0/+4
| | | | |
| * | | | Configure ccache directory.Josh Haberman2016-03-022-2/+8
| | | | |
| * | | | Put Maven in batch mode to avoid spamming the logs.Josh Haberman2016-03-021-4/+7
| | | | |
| * | | | Install Python deps in Docker image.Josh Haberman2016-03-023-13/+25
| | | | |
| * | | | Add another test (javanano), but run it in parallel.Josh Haberman2016-03-022-5/+13
| | | | |
| * | | | Properly add JDK deps in the Docker image.Josh Haberman2016-03-023-5/+19
| | | | |
| * | | | Try running multiple tests in a row.Josh Haberman2016-03-024-51/+57
| | | | |
| * | | | Added ccache support.Josh Haberman2016-03-024-6/+22
| | | | |
| * | | | Added some initial shell scripts and docker file.Josh Haberman2016-03-027-39/+200
| | |_|/ | |/| |
* | | | Merge pull request #1326 from the-alien/csharp_json_nameJon Skeet2016-03-306-9/+206
|\ \ \ \ | |_|/ / |/| | | csharp: add support for the json_name option
| * | | Merge branch 'master' of https://github.com/google/protobuf into ↵alien2016-03-298-17/+39
| |\ \ \ | |/ / / |/| | | | | | | csharp_json_name
* | | | Merge pull request #1358 from thomasvl/travis_tweaksThomas Van Lenten2016-03-292-7/+10
|\ \ \ \ | | | | | | | | | | Mark iOS tests as able to fail.
| * | | | Mark iOS tests as able to fail.Thomas Van Lenten2016-03-292-7/+10
|/ / / / | | | | | | | | | | | | | | | | Travis updated their images to include an xctool that can randomly kill tests, so mark them as flaky to avoid turning things red.
* | | | Merge pull request #1350 from thomasvl/over_releaseThomas Van Lenten2016-03-241-2/+0
|\ \ \ \ | | | | | | | | | | The message was autoreleased, the -releases are an over release.
| * | | | The message was autoreleased, the -releases are an over release.Thomas Van Lenten2016-03-241-2/+0
|/ / / /
* | | | Merge pull request #1345 from smparkes/smparkes/well-known-protosFeng Xiao2016-03-231-0/+6
|\ \ \ \ | | | | | | | | | | export well known protos
| * | | | export well known protosSteven Parkes2016-03-221-0/+6
|/ / / /
* | | | Merge pull request #1344 from topillar/patch-1Feng Xiao2016-03-221-1/+1
|\ \ \ \ | | | | | | | | | | Update coded_stream.h
| * | | | Update coded_stream.htopillar2016-03-221-1/+1
|/ / / / | | | | | | | | fix warning treated as error prevents building on 64-bit windows.
* | | | Merge pull request #1335 from pradeepg26/masterFeng Xiao2016-03-211-4/+3
|\ \ \ \ | | | | | | | | | | Allow custom URLs for Any in JsonFormat
| * | | | Allow custom URLs for Any in JsonFormatPradeep Gollakota2016-03-181-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128
* | | | | Merge pull request #1339 from thomasvl/delay_dispatch_semaphore_creationThomas Van Lenten2016-03-213-3/+19
|\ \ \ \ \ | |/ / / / |/| | | | Only create the readonlySemaphore on demand.
| * | | | Only create the readonlySemaphore on demand.Thomas Van Lenten2016-03-213-3/+19
|/ / / / | | | | | | | | | | | | | | | | | | | | 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.
| * | | Code review fixesalien2016-03-295-7/+5
| | | |
| * | | csharp: add support for the json_name optionalien2016-03-186-8/+207
|/ / / | | | | | | | | | | | | Conflicts: csharp/src/Google.Protobuf/JsonFormatter.cs
* | | Merge pull request #1325 from thomasvl/shrink_overheadThomas Van Lenten2016-03-1758-5160/+1015
|\ \ \ | | | | | | | | Shrink ObjC overhead (generated size and some runtime sizes)
| * | | Shrink ObjC overhead (generated size and some runtime sizes)Thomas Van Lenten2016-03-1758-5160/+1015
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | Merge pull request #1318 from smparkes/smparkes/grpcFeng Xiao2016-03-142-0/+33
|\ \ \ | | | | | | | | add java/util support based on java/util/pom.xml
| * | | add java/util support based on java/util/pom.xmlSteven Parkes2016-03-112-0/+33
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-31 04:13:22 +0000