aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed Unused Parameter warning in headers.Austin Schuh2015-05-203-12/+13
| | | | | | | | | Cherry-pick of: https://github.com/google/protobuf/commit/918e3ee8b46a0f79f97ed0197de08bd61fa5f053 Bug: 21303860 Signed-off-by: Jeff Davidson <jpd@google.com> Change-Id: I2690e676cde4c512412f3ccc15d9f50e59c88213
* Inline unknownFieldData{Equals,HashCode} to generated code.Brian Duff2015-04-061-2/+8
| | | | | | | | | | It turns out dex (apparently) was inlining these protected final methods from ExtendableMessageNano into every message class. Removing these methods from the base class and inlining their code reduces the method count by 2 methods / message when the store_unknown_fields option is on. Change-Id: I0aa09f2016d39939c4c8b8219601793b8fab301f
* am eff5d5b3: am 1d4b8b9f: am ff882b40: Merge "Generate a CREATOR for each ↵Jeff Davidson2015-04-061-0/+11
|\ | | | | | | | | | | | | Parcelable message." * commit 'eff5d5b33b3ef8b655ce43e9f64578a8c8e4e482': Generate a CREATOR for each Parcelable message.
| * Generate a CREATOR for each Parcelable message.Jeff Davidson2015-04-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is less ideal from a dex count perspective because it requires a new variable for each message, and because most apps have proguard rules that will ensure that CREATOR classes are retained. However, it is required to be able to use nano protos inside of AIDL files, as the autogenerated AIDL code fails to compile otherwise. This is a substantial benefit as it allows for backwards-compatible parameters and return types in AIDL methods along the lines of safeparcel. Bug: 19084705 Change-Id: I66a2c0424b96cf8ff6b631b186cc4f9407dfc1f4
| * Inline unknownFieldData{Equals,HashCode} to generated code.Brian Duff2015-03-201-2/+8
| | | | | | | | | | | | | | | | | | | | It turns out dex (apparently) was inlining these protected final methods from ExtendableMessageNano into every message class. Removing these methods from the base class and inlining their code reduces the method count by 2 methods / message when the store_unknown_fields option is on. Change-Id: I0aa09f2016d39939c4c8b8219601793b8fab301f
| * Expose generate_clear as an option.Brian Duff2015-02-211-0/+2
|/ | | | | | | | | | | | | | | | | | I wasn't able to get the clear() method to inline into the constructor when optimizations are on in proguard. As a result, every message has an extra superfluous kept method assuming the app never uses clear() directly. There are a couple of instances where setting this option false is necessary in order to get code dexing successfully without hitting the method limit, e.g. https://goto.google.com/tltzq In this example, I tried turning on the method/inlining/unique and method/inlining/short optimizations before resorting to adding the generate_clear option, but the method count did not decrease. The clear() methods were contributing over a thousand extra methods. Change-Id: If6a9651d6a59cdf70b1040d8248779710ac73105
* Generate @IntDef annotations for nanoproto enums.Jeff Davidson2015-02-194-9/+68
| | | | | | | | | | @IntDef is a support library annotation which allows build tools to determine the valid set of values for a given integer field when that field is intended to be restricted like an enum. This avoids the overhead of enums while still allowing for compile-time type checking in most circumstances. Change-Id: Iee02e0b49a8e069f6456572f538e0a0d301fdfd5
* Upgrade protobuf library to v2.6.1.Jeff Davidson2015-01-20229-265/+502
| | | | | | | | | | | | | | | | The previous commit was actually between v2.6.0 and v2.6.1. This CL was created by generating a patch with: git format-patch edc5994525c79cd1919859a370837a6ff7c8e308..v2.6.1 and applying this patch to the tree. The patch was clean except for pom.xml, where the packaging type should have previously been changed from "jar" to "bundle". Reran ./configure && make -j12 check to regenerate configure script and makefiles. Change-Id: I817ff426c9a512cbda0246df5aee38f97e762dea
* Update protobuf's gtest to expected version.Jeff Davidson2015-01-201-1069/+1234
| | | | | | | | | | Generated by running: rm -rf gtest ./autogen.sh ./configure Change-Id: I5d9c0bea09dd9d3e4d7d4442dd8222011f5c522a
* Update protobuf library from 2.3 to 2.6.Jeff Davidson2015-01-15229-8763/+46788
| | | | | | | | | | | | | | | | | | | | | | | | | | | Copied in all files from the open source protobuf project at commit edc5994525c79cd1919859a370837a6ff7c8e308, removing files which have been renamed (COPYING.txt -> LICENSE, README.txt -> README.md). Removed 2.3 prebuilts, which is an approach that will not work due to incompatibility with the 2.6 runtime. Merged in micro/nano-specific changes in the following files: -Android.mk - updated list of C++/Java sources, bumped versions -java/README.txt - merged in micro/nano instructions, bumped versions -java/pom.xml - merged in micro/nano build rules, set packaging to jar -src/Makefile.am - merged in references to micro/nano generators -src/google/protobuf/compiler/javamicro/javamicro_file.h - imported google/protobuf/compiler/code_generator.h and removed redundant OutputDirectory class. -src/google/protobuf/compiler/javanano/javanano_file.h - same -Replaced instances of vector with std::vector as needed to get libprotobuf-cpp-full to compile. Plan to upstream this fix per discussion with protobuf maintainers. Reran autogen.sh to update ./configure and associated scripts. Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
* Merge "When no clear() is generated, still initialize fields."Brian Duff2015-01-092-12/+21
|\
| * When no clear() is generated, still initialize fields.Brian Duff2015-01-092-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android-review.googlesource.com/#/c/67890/ removed field initialization from the ctor, making it just call clear() instead. When I added the generate_clear option back (as part of the reftypes compat mode) in https://android-review.googlesource.com/#/c/109530/, I forgot to ensure that what clear() used to do was inlined in the constructor. This change fixes NPEs that are happening for users of reftypes_compat_mode who rely on unset repeated fields being empty arrays rather than null. Change-Id: Idb58746c60f4a4054b7ebb5c3b0e76b16ff88184
* | Add clone() method support for nano.Brian Duff2015-01-0912-5/+96
|/ | | | | | Upstreamed from Another Place (cr/57247854). Change-Id: I2aaf59544c0f5ae21a51891d8a5eeda1dc722c90
* Fix bug with large extension field numbers.Brian Duff2014-10-032-1/+4
| | | | | | | | | | | | | | | | | | | Previously, extensions with field numbers greater than 268435455 would result in a compile time error in generated code that looks something like this: Foo.java:3178: error: integer number too large: 3346754610 3346754610); This is because we were trying to represent the tag number (an unsigned int) using a java int constant, but java int constants are signed, and can't exceed Integer.MAX_VALUE. Fixed by declaring it as a long instead, and casting it down to an int in the implementation. This is safe, because the tag value always fits in 32 bis. Change-Id: If2017bacb4e20af667eaeaf9b65ddc2c30a7709f
* Change reftypes_primitive_enums to reftypes_compat_mode.Brian Duff2014-10-013-12/+31
| | | | | | Make the clear() method stripped in reftypes_compat_mode. Change-Id: I0ec35537856f59a6ecf231bfd74df995c858e2b2
* Adds a primitive enum mode for reftypes.Brian Duff2014-09-304-4/+23
| | | | | | This is a compatibility shim. Change-Id: Ia0b417d4621e391ede618d0b3b1c470c9896e0ff
* Includes a MessageNano subclass's name's hashCode in hashCode calculations.Jason Neufeld2014-09-161-0/+1
| | | | | | | | | | In the current implementation, a message with the same amount of null or equal-valued fields as a different message type will have the same hashCode. This adds more variety by including the hashCode of the class's name in the hashCode calculations. Change-Id: I284e3e6d198ad8037815948d1f65686465ffd623 Signed-off-by: Jason Neufeld <jneufeld@google.com>
* Fix the aprotoc target for Windows.Leandro Gracia Gil2014-07-281-1/+1
| | | | | | Allows aprotoc.exe to be cross-compiled when building the Windows SDK. Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
* Don't return NULL from {Boxed}PrimitiveTypeName.Brian Duff2014-07-211-4/+4
| | | | | | | The behavior of the string ctor is undefined when you pass NULL. This is checked strictly in C++11, so fails to compile. Change-Id: Id5e0984ad1d37f2d504f7c42ac23e52ed4a58903
* Fix access around unknownFieldData.Max Cai2014-07-153-9/+4
| | | | | | | | | | | Instead of publishing its class I chose to encapsulate the troublesome references in equals()/hashCode() in the generated code into superclass methods in ExtendableMessageNano. Changed a couple of java packages in the test suite to catch this issue easier in the future. Change-Id: I43f88411f63bb6f3ffc8d63361f2f77bebf6220a
* Support generation of Parcelable nano messages.Jeff Davidson2014-04-253-2/+20
| | | | | | | | | | | | | | | | | | | | This CL adds the "parcelable_messages" option. When enabled, all generated message classes will conform to the Android Parcelable contract. This is achieved by introducing a new parent class for generated classes which implements the required functionality. Since the store_unknown_fields option also makes use of a superclass, ExtendableMessageNano, we have two versions of the new Parcelable superclass: one extending MessageNano, and one extending ExtendableMessageNano. These classes are otherwise identical. As these classes depend on Android framework jars, they are not included in the host .jar build of the nanoproto library. Finally, add a test suite for running tests of Android-specific functionality, as this cannot be done on a desktop JVM. Change-Id: Icc2a257f03317e947f7078dbb9857c3286857497
* Adds --ignore_service nano proto compiler flagJie Dai2014-04-233-2/+13
| | | | | | | | Nano proto compiler normally throws an error if any service is defined. If --ignore-services=true is set, no error is thrown and the service is simply skipped. Change-Id: Id82583555085cc55550d03a485d3f0189885240b
* Don't reset cachedSize to 0 in getSerializedSizeDave Hawkey2014-04-101-3/+2
| | | | | | | | | | | | This avoids a race-condition when cachedSize is momentarily set to 0 for non-empty messages if multiple threads call getSerializedSize (e.g. during serialization). This is a retry of https://android-review.googlesource.com/#/c/88570/. getSerializedSize() has been kept non-final so that messages generated with a previous version of the compiler will not break. Change-Id: I8d8154a10938cde579ae19c55eae55b1e70e0bda
* Revert "Don't reset cachedSize to 0 in getSerializedSize"Wink Saville2014-03-211-2/+3
| | | | This reverts commit c6e12c6702ca764486f952654ba1568f00efe813.
* Don't reset cachedSize to 0 in getSerializedSizeDave Hawkey2014-03-211-3/+2
| | | | | | | | This avoids a race-condition when cachedSize is momentarily set to 0 for non-empty messages if multiple threads call getSerializedSize (e.g. during serialization). Change-Id: I15a8ded92edbf41bf1c8d787960c5bbbc8a323c5
* Fix compile error on mac 10.9Wink Saville2014-02-211-0/+1
| | | | | | | | Add #<include> istream to message.cc which was the solution to this bug: https://code.google.com/p/protobuf/issues/detail?id=570 Change-Id: Ic63730fdbe73234bf7efdd50ff0b55bb11ca0fd4
* Merge "Extension overhaul."Max Cai2014-02-179-131/+258
|\
| * Extension overhaul.Max Cai2014-01-109-131/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Get rid of TypeLiteral<T>. It was introduced to read the component type of a List<T> at runtime. But we use arrays everywhere else, and we can always read the component type of an array type at runtime. - Properly read/write "minor" types (e.g. sint32, sfixed32). The old implementation could only read/write data as the "typical" types (one per Java type), e.g. java.lang.Integer -> int32, java.lang.Long -> int64. So if e.g. an extension specifies sfixed32 as the type, it would be read/written in the totally incompatible int32 format. - Properly serialize repeated packed fields. The old implementation doesn't do packed serialization. As an added bonus, and to be more aligned with the rest of protobuf nano / main, repeated packable extensions can deserialize both packed and non-packed data. - Split Extension class into a hierarchy so under typical usage a large chunk of code dealing with primitive type extensions can be removed by ProGuard. Bug: https://code.google.com/p/android/issues/detail?id=62586 Change-Id: I0d692f35cc2a8ad3a5a1cb3ce001282b2356b041
* | Fix repeated packed field merging code for non-packed data.Max Cai2014-01-161-1/+4
| | | | | | | | | | | | | | Enum fix is already included in the previous commit. Bug: https://code.google.com/p/android/issues/detail?id=64893 Change-Id: I9fecff3c8822918a019028eb57fa39b361a2c960
* | Add validation when parsing enum fields.Max Cai2014-01-164-33/+148
| | | | | | | | | | | | | | | | | | | | | | | | Invalid values from the wire are silently ignored. Unlike full/lite, the invalid values are not stored into the unknown fields, because there's no way to get them out from Nano's unknown fields without a matching Extension. Edited README and slightly moved it towards a standalone section for Nano, independent of the Micro section. Change-Id: I2c1eb07f4d6d8f3aea242b8ddd95b9c966f3f177
* | Allow whitespace in nano codegen options.Max Cai2014-01-141-22/+37
| | | | | | | | | | | | So we don't need to keep all option in a single line in the .mk files. Change-Id: I786b879b334cac4cd13b32fabcb76efe53b4ac80
* | Correctness: floating point equality using bits instead of ==.Max Cai2014-01-103-40/+62
| | | | | | | | | | | | | | | | | | | | | | Special values for float and double make it inaccurate to test the equality with ==. The main Java library uses the standard Object.equals() implementation for all fields, which for floating point fields means Float.equals() or Double.equals(). They define equality as bitwise equality, with all NaN representations normalized to the same bit sequence (and therefore equal to each other). This test checks that the nano implementation complies with Object.equals(), so NaN == NaN and +0.0 != -0.0. Change-Id: I97bb4a3687223d8a212c70cd736436b9dd80c1d7
* | Don't serialize required fields whose 'has' flags are unset.Max Cai2014-01-103-5/+9
|/ | | | Change-Id: Ibbe944fff83e44a8f2206e18ee9ec6f10661297a
* Avoid class initializers to help ProGuard.Max Cai2013-12-1010-76/+219
| | | | | | | | | | | | | | | | | | | Class initializers prevent ProGuard from inlining any methods because it thinks the class initializer may have side effects. This is true for static methods, but instance methods can still be inlined, because to have an instance you will have touched the class and any class initializers would have run. But ProGuard only starts inlining instance methods of classes with class initializers from v4.11b6, and Android uses v4.4 now. This change tries to avoid the class initializers as much as possible, by delaying the initialization of the empty array and some fields' saved defaults until when they're needed. However, if the message hosts any extensions, they must be public static final and therefore introducing the class initializer. In that case we won't bother with lazy initialization. Change-Id: I00d8296f6eb0023112b93ee135cdb28dbd52b0b8
* Nano: don't generate accessor methods for nested methodsAndrew Flynn2013-12-093-119/+6
| | | | | | | | | For nested message objects, don't generate accessor methods because they have a default value that is not a valid value (null), so there is no reason to have get/set/has/clear methods for them. Clients and protos (while serializing) can check against the invalid value to see if it's been set. Change-Id: Ic63400889581271b8cbcd9c45c84519d4921fd4b
* Align with main: two ways of parsing repeated packable fields.Max Cai2013-11-188-106/+252
| | | | | | | | | | | | | | | It is a requirement for parsing code to handle packed and unpacked forms on the wire for repeated packable fields. This change aligns the javanano's behavior with the java's. Bonus: optimize array length calculation when parsing repeated fixed-size-element-type fields. Bonus 2: lose "xMemoizedSerializedSize" for repeated enum fields, and make the serialized size calculation match that for repeated int32 fields. Change-Id: I8a06103d9290234adb46b0971b5ed155544fe86a
* Fix warnings warnings in header files, hide others.Kristian Monsen2013-11-132-3/+3
| | | | | | Follow upstream where they have any changes in 2.5.0 Change-Id: I3466e9c11242f533a9dff8c1afef4202dd100f2e
* Minimize method count for nanoproto.Tom Chao2013-11-112-61/+28
| | | | | | | | | | | - Migrates getCachedSize to the MessageNano parent class to save one method per message. - Create ExtendableMessageNano parent class for protos with extensions, this saves the getExtension and setExtension methods on the relevant messages. - getSerializedSize's default case (with no fields to serialize) also migrate to the parent class, which saves methods on empty messages. - Container classes become interfaces to save the constructor. Change-Id: I81f1a1b6d6a660096835e9df3ea20456655aab4a
* Allow for ref-type arrays containing null elements.Aurash Mahbod2013-11-052-20/+51
| | | | | | | | | | | | | | | | | | | Strip the null elements out before serializing the array. This is helpful in the cases where the user wants to construct an array of an inexact size for serialization. For example: User constructs array of size 5 because they anticipate adding more than 1 element before serialization. Only 3 get added, so the array looks like [Obj, Obj, Obj, null, null]. This would curently crash without this CL. All repeated fields of ref-type elements can contain null elements: repeated strings, repeated bytes, and repeated messages/groups. Change-Id: I117391c868c9a436536d70d6151780e9cc7e8227 Conflicts: src/google/protobuf/compiler/javanano/javanano_message_field.cc
* Implement hashCode() and equals() behind a generator option.Brian Duff2013-10-2513-57/+456
| | | | | | | | | | | | | | | | The option is only called 'generate_equals' because: - equals() is the main thing; hashCode() is there only to complement equals(); - it's shorter; - toString() should not be included in this option because it's more for debugging and it's more likely to stop ProGuard from working well. Also shortened the "has bit" expression; was ((bitField & mask) == mask), now ((bitField & mask) != 0). Both the Java code and the bytecode are slightly shorter. Change-Id: Ic309a08a60883bf454eb6612679aa99611620e76
* Feature request: set() and clear() accessors return thisMax Cai2013-10-163-17/+27
| | | | | | | | | | | | Also pre-inlines set() and has() in serialization code. This could theoretically help ProGuard: the message class size is usually large, and because of this only, it may refuse to inline an accessor into the serialization code, and as a result keeps the accessor intact. Chances are, after pre-inlining all accessor calls within the message class, those accessors become unused or single-use, so there are more reasons for ProGuard to inline and then remove them. Change-Id: I57decbe0b2533c1be21439de0aad15f49c7024dd
* Make generated code more aligned with Google Java style.Max Cai2013-10-166-55/+78
| | | | | | | | | | | | | | - Blank line after opening a message class (but not an enum interface). - Let all code blocks insert blank lines before themselves. This applies to 'package' statement, all message classes, enum classes or constant groups, extensions, bitfields, proto fields (one block per field; i.e. accessors don't have blank lines among them), and basic MessageNano methods. In this case we don't need to guess what the next block is and create blank lines for it. - Fixed some newline/indent errors. - Only one SuppressWarnings("hiding") per file. Change-Id: I865f52ad4fb6ea3b3a98b97ac9d78d19fc46c858
* Fix repeated field merging semantics.Max Cai2013-10-154-33/+95
| | | | | | | | | | The public doc states that repeated fields are simply concatenated and doesn't impose a different semantics for packed fields. This CL fixes this for packed fields and adds tests covering all cases. Also fixed a bit of missed null-repeated-field treatments. Change-Id: Ie35277bb1a9f0b8171dc9d07b6adf9b9d3308de2
* Protect against null repeated fields.Brian Duff2013-10-143-18/+25
| | | | | | | | | There's no distinction between a repeated field being null and being empty. In both cases, nothing is sent on the wire. Clients might for whatever reason inadvertently set a repeated field to null, so protect against that and treat it just as if the field was empty. Change-Id: Ic3846f7f2189d6cfff6f8ef3ca217daecc3c8be7
* Remove all field initializers and let ctor call clear().Max Cai2013-10-114-14/+18
| | | | | | | | | The field initializers have basically caused the compiled <init> method to inline the whole clear() method, which means if ProGuard is not used or failed to inline or remove clear(), there are two big chunks of code that do the same thing. So why not just call clear() from the ctor. Change-Id: Ief71e2b03db2e059b3bfa98309649368089ffab0
* Merge "Add reftypes field generator option."Ulas Kirazci2013-10-096-10/+167
|\
| * Add reftypes field generator option.Brian Duff2013-10-076-10/+167
| | | | | | | | | | | | | | | | This option generates fields as reference types, and serializes based on nullness. Change-Id: Ic32e0eebff59d14016cc9a19e15a9bb08ae0bba5 Signed-off-by: Brian Duff <bduff@google.com>
* | Fix some indenting issues with set__() functionAndrew Flynn2013-10-081-10/+6
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it looked like this: public final class OuterClass { [...] public static final class InnerClass extends com.google.protobuf.nano.MessageNano { [...] public void setId(java.lang.String value) { if (value == null) { throw new java.lang.NullPointerException(); } id_ = value; bitfield0_ |= 0x00000001; [...] } [...] } Now it looks like this: public final class OuterClass { [...] public static final class InnerClass extends com.google.protobuf.nano.MessageNano { [...] public void setId(java.lang.String value) { if (value == null) throw new java.lang.NullPointerException(); id_ = value; bitfield0_ |= 0x00000001; [...] } [...] } Change-Id: I2a9289b528f785c846210d558206d677aa13e9be
* Fix roundtrip failure with groups when unknown fields are enabled.Nicholas Seckar2013-10-041-0/+6
| | | | | | | | | | | | | | | | When parsing a group, the group's end tag should not be stored within the message's unknownFieldData. Not only does this waste space, it is also output the next time the group is serialized, resulting in two end tags for that group. The resulting bytes are not always a valid protocol buffer and may fail to parse. This change ensures that group end tags do not result in an unknownFieldData entry, and that messages with groups can be roundtripped without corruption. Change-Id: I240f858a7217a7652b756598c34aacad5dcc3363 Conflicts: java/src/test/java/com/google/protobuf/NanoTest.java
* Implement enum_style=java option.Max Cai2013-09-255-19/+161
| | | | | | | | | | This javanano_out command line option creates a container interface at the normal place where the enum constants would reside, per enum definition. The java_multiple_files flag would now affect the file- scope enums with the shells. If the flag is true then file-scope container interfaces are created in their own files. Change-Id: Id52258fcff8d3dee9db8f3d8022147a811bf3565
generated by cgit v1.1 at 2024-04-27 12:35:38 +0000