Commit Graph

3629 Commits

Author SHA1 Message Date
Feng Xiao
17b6fc31eb Merge pull request #1409 from eeight/fix_enum_corruption
Fix bug with silent message corruption in LITE_RUNTIME.
2016-05-04 10:55:13 -07:00
Joshua Haberman
72e162ce96 Merge pull request #1482 from nicolasnoble/rake-tweaks-2
Properly generating well known proto files for the macos build.
2016-05-03 17:57:53 -07:00
Nicolas "Pixel" Noble
edd29498f4 Properly generating well known proto files for the macos build. 2016-05-04 02:40:25 +02:00
Joshua Haberman
07bcf21a9c Merge pull request #1464 from google/benchmarks
Added framework for generating/consuming benchmarking data sets.
2016-05-03 13:11:20 -07:00
Joshua Haberman
7dda312224 Merge pull request #1473 from nicolasnoble/rake-tweaks
Few tweaks to the rakefile to permit native gems compilation with the proto files generation.
2016-05-03 13:10:02 -07:00
Josh Haberman
247ef1f0df Addressed PR comments. 2016-05-03 12:53:49 -07:00
Jisi Liu
09f1757cf5 Merge pull request #1467 from pherl/master
Merge Google internal changes
2016-04-30 20:36:00 -07:00
Nicolas "Pixel" Noble
236b93937f Addressing concerns. 2016-04-30 02:15:15 +02:00
Jisi Liu
e0df23ac14 Update descritpor protos for objc 2016-04-29 11:41:38 -07:00
Thomas Van Lenten
aed7b345fa Merge pull request #1474 from pherl/fixscript
Fix cp -r usage to be portable.
2016-04-29 14:37:53 -04:00
Jisi Liu
454d5be8d3 Merge the script fix. 2016-04-29 11:35:59 -07:00
Jisi Liu
cf7e99db96 Fix cp -r usage to be portable.
cp -r foo/ bar/ in linux will create a bar/foo directoy. In the
objectivec generate descritpor case, well known types will be created in
objectivec/google/google/protobuf/.. if the command is run under linux.

Adding the trailing period fixes the behavior inconsistency.
2016-04-29 11:31:57 -07:00
Nicolas "Pixel" Noble
1f8b6da920 Few tweaks to the rakefile to permit native gems compilation with the proto files generation. 2016-04-29 20:00:43 +02:00
Josh Haberman
b2d4b1a528 Fixed for pre-C++11 ifstream which does not accept std::string. 2016-04-29 10:25:52 -07:00
Josh Haberman
49a8918e97 Read files directly from filesystem since xxd isn't always available. 2016-04-29 10:19:03 -07:00
Josh Haberman
cb36bde047 Make the C++ tests build the benchmarking code. 2016-04-29 09:52:20 -07:00
Josh Haberman
1ce5bd8e84 Updates for PR comments. 2016-04-29 09:39:26 -07:00
Jon Skeet
61307b86f5 Allow custom type URL prefixes in Any.Pack
(And likewise ignore the prefix in unpack.)

Fixes issue #1459.
2016-04-29 10:20:03 +01:00
Jisi Liu
f86d39c295 Update file lists. 2016-04-28 14:43:22 -07:00
Jisi Liu
12fdeb9b41 Merge branch 'master' of github.com:google/protobuf 2016-04-28 14:43:08 -07:00
Jisi Liu
cf14183bcd Down integrate from Google internal. 2016-04-28 14:34:59 -07:00
Adam Cozzette
b53417c735 Merge pull request #1462 from acozzette/ruby-2.3
Added dig and bsearch_index to RepeatedField methods forwarded to array
2016-04-28 08:26:26 -07:00
Josh Haberman
30a2f70eb3 Added README describing the directory. 2016-04-27 18:34:33 -07:00
Josh Haberman
2e83110230 Added framework for generating/consuming benchmarking data sets.
This takes the code that was sitting in benchmarks/
already and makes it easier for language-specific
benchmarks to consume.  Future PRs will enhance this
so that the language-specific benchmarks can report
metrics back that will be tracked over time in PerfKit.
2016-04-27 18:22:22 -07:00
Thomas Van Lenten
cbb6b285d7 Merge pull request #1461 from thomasvl/fix_bool_handing
Fix up -hash/-isEqual: for bool storage.
2016-04-27 16:09:06 -04:00
Thomas Van Lenten
30646288ad Fix up -hash/-isEqual: for bool storage.
Both methods weren't checking the has_bits (where the bools are stored), so
it resulted in invalid results.

Add a test that should shake out something like this in the future also.
2016-04-27 13:57:11 -04:00
Adam Cozzette
bbb68fe63d Added dig and bsearch_index to RepeatedField methods forwarded to array
This fixes the test_acts_likes_an_array test in RepeatedFieldTest, which
checks that repeated fields respond to the same methods as regular Ruby
arrays. The bsearch_index and dig array methods seem to be new in Ruby
2.3 and so we should support those.
2016-04-27 10:51:22 -07:00
Joshua Haberman
f53f911793 Merge pull request #1455 from haberman/updateupb
Updated upb and simplified ruby code a bit with new upb method.
2016-04-27 10:37:33 -07:00
Thomas Van Lenten
66f074592d Merge pull request #1454 from thomasvl/enum_defaults
Proper checking of enum with non zero default
2016-04-26 19:11:14 -04:00
Thomas Van Lenten
18b6a321b5 Proper checking of enum with non zero default
proto2 syntax allows the first enum to have a non zero value. This means any
field using that default has a non zero default without having an explicit
default being set. So when deciding what runtime info is needed, don't rely
on an explicit default, always check that the values aren't zero.

Fixes https://github.com/google/protobuf/issues/1453
2016-04-26 15:15:49 -04:00
Josh Haberman
d419ca10b4 Updated upb and simplified ruby code a bit with new upb method. 2016-04-22 14:12:10 -07:00
Feng Xiao
4057447997 Merge pull request #1444 from mbrtargeting/master
Added serialVersionUID to ExtendableMessage.
2016-04-22 11:45:31 -07:00
Tony Allevato
385755e13b Add initial design document for Swift protocol buffers. (#1442)
* Add initial design doc for Swift protocol buffers.
2016-04-22 12:15:14 -04:00
Jakub Kukul
db93833bc6 Added serialVersionUID to ExtendableMessage. 2016-04-22 16:04:27 +02:00
Feng Xiao
034294bfb0 Merge pull request #1438 from xfxyjwf/docs
Add a docs directory and move the third-party add-ons page here.
2016-04-21 11:45:58 -07:00
Petr Prokhorenkov
f4f9aec52f Fix bug with silent message corruption in LITE_RUNTIME.
A protobuf message will be corrupted in the following scenario:
  1. Use LITE_RUNTIME.
  2. Have an optional enum field following some other field.
  3. Update protocol by adding new values to the enum.
  4. Have an old client parse and serialize a message having enum field
      set to a value the client does not understand.
  5. Field preceeding the enum is now corrupted.

The bug is due to the fact that optimized fallthrough in parser code
does not update variablle 'tag' when jumping to the parser code for the
next field.
2016-04-21 09:27:33 +03:00
Feng Xiao
0ad204845f Merge pull request #1416 from cwhipkey/master
Change protobuf CPP proto generator to support the 'lite' option in
2016-04-20 17:15:16 -07:00
Feng Xiao
8052dc75a9 Add a docs directory and move the third-party add-ons page here. 2016-04-20 15:49:45 -07:00
Ben Boeckel
462e7fab98 protoc: support '=' in --proto_path arguments 2016-04-20 18:22:41 -04:00
Feng Xiao
f00300d7f0 Merge pull request #1414 from xyzzyz/googletest
Remove googletest.h header from stringprintf.cc
2016-04-20 11:20:34 -07:00
Thomas Van Lenten
1ccb4ca8ba Merge pull request #1434 from jskeet/regenerate
Regenerate descriptor/well-known types for C#
2016-04-20 14:15:51 -04:00
Jon Skeet
c588ac42a2 Regenerate well-known types for C#
(There are documentation changes and new fields in descriptor.proto that have resulted
in changes to the serialized descriptor, but no breaking changes for C#.)
2016-04-20 17:19:42 +01:00
Thomas Van Lenten
e539e9820e Merge pull request #1433 from thomasvl/check_wkt
ObjC support for failing the build in the generated WKTs are out of date
2016-04-20 11:58:18 -04:00
Thomas Van Lenten
511f28b73a ObjC support for failing the build in the generated WKTs are out of date
- Always generated into a temp directory so we can see if things changed.
- Add a flag to control exiting with error when stale vs updating.

This should let the continuous builds error out when ObjC needs to have the
checked in sources updated.
2016-04-20 10:14:18 -04:00
Jon Skeet
f265fb8152 Merge pull request #1401 from jskeet/enum-casing
Enum casing in C#
2016-04-20 09:01:58 +01:00
Joshua Haberman
36978c3938 Merge pull request #1417 from seishun/windows2
Support Windows in gulpfile.js
2016-04-19 23:42:06 -07:00
Jon Skeet
d90d615f71 Attempt to fix AppVeyor build by exporting GetEnumValueName 2016-04-20 03:46:03 +01:00
Jon Skeet
790f4c8e37 Use the original name in JSON formatting.
(JSON parsing already does the right thing.)
2016-04-20 03:46:02 +01:00
Jon Skeet
84ea2c7a81 Regenerate all C# code and make it compile
JSON tests fail, as we're not using OriginalNameAttribute yet.
2016-04-20 03:46:00 +01:00
Jon Skeet
75626ed79c Add C# codegen changes to enum value names (mostly C++)
Overview of changes:
- A new C#-specific command-line option, legacy_enum_values to revert to the old behavior
- When legacy_enum_values isn't specified, we strip the enum name as a prefix, and PascalCase the value name
- A new attribute within the C# code so that we can always tell the original in-proto name

Regenerating the C# code with legacy_enum_values leads to code which still compiles and works - but
there's more still to do.
2016-04-20 03:45:59 +01:00