AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
430 Commits 35 Branches 138 Tags 124 MiB
4d0809c712
Commit Graph

430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Metcalf
4d0809c712 am cd22086d: am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. 
* commit 'cd22086de194f7d8b94b47627c4c4f3fecfee95c':
 2014-08-21 02:47:23 +00:00
Wink Saville
628e245da3 am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc 
* commit 'aa2e7e5fb6358b70d17b5dfe145cef61db1888ce':
 2014-08-21 02:47:22 +00:00
Wink Saville
64b1c7780b am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 
* commit 'ed67cd79c6deb58ba287a45753b076bed3a817c5':
 2014-08-21 02:47:21 +00:00
Wink Saville
bf6b7cb8f7 am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 
* commit '1c524da854c2351a5fc92f77fa4f63980ba5b4c7':
 2014-08-21 02:47:20 +00:00
Wink Saville
07c34fa29b am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 
* commit '3c00157ec8e7d64e1a23c4b3a48edfcf28e3f70d':
 2014-08-21 02:47:20 +00:00
Wink Saville
052abeef0c am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 
* commit 'a94fe6cb54165b8139b719f287cdad4973f93643':
 2014-08-21 02:47:19 +00:00
Ying Wang
0f91148556 am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" 
* commit 'b09fd32de981b889f973de772a696cef47162ebf':
 2014-08-21 02:47:17 +00:00
Adam Metcalf
a4a0dbf44e am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. 
* commit 'c0bc136bb738812862d45b53f8546200741d558b':
 2014-08-20 20:57:46 +00:00
Wink Saville
40a85d0678 am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc 
* commit '3a2460f3dda97d12e4f592d727549fe7b1214b40':
 2014-08-20 20:57:45 +00:00
Wink Saville
9d07847a87 am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 
* commit 'd801ea90d87ceb1aa4d2cf591885c3d2c885d1d8':
 2014-08-20 20:57:45 +00:00
Wink Saville
f3223cd16e am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 
* commit '9f4f73e2ef3cfad4f364d6b4a3d11e6eca6aa172':
 2014-08-20 20:57:44 +00:00
Wink Saville
28448e6ef2 am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 
* commit '02cba9f2f4aeaf5f0f004d030c7bf379aeaecd79':
 2014-08-20 20:57:44 +00:00
Wink Saville
c5a596db72 am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 
* commit '7a8797abb1f80e93522b0a7c7acd177afb3ba0a4':
 2014-08-20 20:57:43 +00:00
Ying Wang
5c53e89aeb am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" 
* commit 'f25e1e6bb77d583855d68c72a3bfd237a12178ab':
 2014-08-20 20:57:39 +00:00
Adam Metcalf
87f4899a90 am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers. 
* commit '67f3f6aa6d6b43d596ab5a572c6ae34fb60a8066':
 2014-08-20 20:48:27 +00:00
Wink Saville
50b34232c9 am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc 
* commit 'f3bf05831fdad617a7841d7943a9f6f5797582a8':
 2014-08-20 20:48:27 +00:00
Wink Saville
6e81fbbc16 am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 
* commit '2fb1789c06fa82f73d136d83189ad1a54043348d':
 2014-08-20 20:48:27 +00:00
Wink Saville
feac014e7d am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 
* commit '50ddd7addefb02ca23efd2f2c60442f91e276792':
 2014-08-20 20:48:26 +00:00
Wink Saville
b5c235ccc2 am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto." 
* commit '05f45faa5951f5ae0d05e0a4a9f5249339df31b4':
 2014-08-20 20:48:26 +00:00
Wink Saville
e8e5707aee am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano." 
* commit '77140fb2a041eec2ef96cff59f8fa81c9355fcf3':
 2014-08-20 20:48:25 +00:00
Ying Wang
c89112387e am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT" 
* commit '165d4d7e343099e4b84137b852a0a2070c27bba4':
 2014-08-20 20:48:25 +00:00
Max Cai
4be139dcd8 am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works" 
* commit 'a76831c3629c3c1a9900984f3aea6306dbf0734c':
  Fix how getRepeatedFieldArrayLength works
 2014-08-07 10:48:20 +00:00
Sam Hasinoff
33824b0f1b am f91b7fa1: Fix build, by using external/zlib instead of system zlib 
* commit 'f91b7fa173d2aa76ce593c20e429bd8d480599ea':
  Fix build, by using external/zlib instead of system zlib
 2014-08-05 18:23:57 +00:00
Sam Hasinoff
333c46cd1d Fix build, by using external/zlib instead of system zlib 
Change-Id: I22f72f7c21f0c3f7b40deeca429af39453dfdc51
 2014-08-05 11:00:00 -07:00
Max Cai
ec0e1c00e0 Merge "Fix how getRepeatedFieldArrayLength works" 2014-08-05 00:20:55 +00:00
Leandro Gracia Gil
985cc6a74e am 4d11e705: Merge "Fix the aprotoc target for Windows." 
* commit '4d11e705cb073e55283452e6fd50e3feff54f82c':
  Fix the aprotoc target for Windows.
 2014-07-31 18:26:01 +00:00
Leandro Gracia Gil
a174231837 Merge "Fix the aprotoc target for Windows." 2014-07-29 21:36:05 +00:00
Leandro Gracia Gil
b596f9c7b4 Fix the aprotoc target for Windows. 
Allows aprotoc.exe to be cross-compiled when building the Windows SDK.

Change-Id: I7e1eec945b5578e1fe6c368b128fe1f9396f491c
 2014-07-28 15:27:21 -07:00
Brian Duff
c390fe3eb3 am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName." 
* commit '95d99df4574c28debcf9646056a0350ff44bc7c9':
  Don't return NULL from {Boxed}PrimitiveTypeName.
 2014-07-22 13:34:40 +00:00
Brian Duff
23c5978a76 Merge "Don't return NULL from {Boxed}PrimitiveTypeName." 2014-07-21 15:45:44 +00:00
Brian Duff
7acc0f831f Don't return NULL from {Boxed}PrimitiveTypeName. 
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
 2014-07-21 14:31:07 -07:00
Max Cai
a481ed8269 am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano." 
* commit '11607eb10bcf3a46e92257966949d48b28bb7bf3':
  Add a hasExtension method to ExtendableMessageNano.
 2014-07-18 15:52:27 +00:00
Max Cai
2a5f3f97a0 Merge "Add a hasExtension method to ExtendableMessageNano." 2014-07-17 22:36:58 +00:00
Juan Silveira
c052b50388 Add a hasExtension method to ExtendableMessageNano. 
It allows checking for the presence of an extension without having to
deserialize the field.

Change-Id: Id542d20274b2435b7bc2b322740e9984cb8639a1
 2014-07-17 18:47:58 +01:00
Max Cai
2e91cf4f68 am a88808d4: Merge "Fix access around unknownFieldData." 
* commit 'a88808d414308b5b567d3afaab56fc338ad80667':
  Fix access around unknownFieldData.
 2014-07-15 15:22:02 +00:00
Max Cai
9c2d63c8d3 am daf63839: Merge "Keep pointers to extension values." 
* commit 'daf638399bd42122306786e8062f392ddace4363':
  Keep pointers to extension values.
 2014-07-15 13:34:16 +00:00
Max Cai
30b1454d8b Merge "Keep pointers to extension values." 2014-07-14 21:03:45 +00:00
Max Cai
7a83d3482a Merge "Fix access around unknownFieldData." 2014-07-14 20:58:48 +00:00
Max Cai
d1a8a8f6f1 Fix access around unknownFieldData. 
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
 2014-07-15 15:38:04 +01:00
Juan Silveira
79f19eb9f1 Keep pointers to extension values. 
The current implementation of getExtension deserialises the field from bytes
and returns a new object every time. This means that changes to those objects
are reflected when the messages is serialised unless setExtension is called. It
also means that every call to getExtension and setExtension is expensive.

This change introduces a FieldData class that contains everything that's known
about the field at the time. This can be all the tag/byte[] pairs associated
with a given field or an Extension and a value object. This is so that two
messages with a repeated extension can be compared even if the extension
has been deserialised in one of them but not the other.

This change also adds FieldArray class based on SparseArray from the Android
compatibility library. This is used in ExtendableMessageNano to make lookup
of FieldDatas by their field number faster.

Implications:
* calling getExtension multiple times deserialises the field only once and
  returns the same object.
* calling setExtension doesn't cause the object to be serialised immediately,
  that only happens when the container message is serialised.
* getExtension is no longer a read-only thread-safe operation. README.txt has
  been updated to relfect that.
* comparison using equals and hashCode continues to work.

Bug: 10863158

Change-Id: I81c7cb0c73cc0611a1f7c1eabf5eed259738e8bc
 2014-07-14 16:54:28 +01:00
Max Cai
9ceb3d4acc Fix how getRepeatedFieldArrayLength works 
Change-Id: I01921eff008a8e3f7b1fbeb653d15ff8038d3220
 2014-07-03 12:27:04 +01:00
Ying Wang
30cd2a4a98 am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 
* commit '403cc9277c5540cf14b6e53a4fedf3ae5499f4cf':
  You CANNOT change the global WITH_DEXPREOPT
 2014-05-21 18:10:40 +00:00
Baligh Uddin
c7213e1c39 am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 
* commit '39467629a7fb35da9fdfab4dd7603b9bfd7d9095':
 2014-05-21 18:10:40 +00:00
Ying Wang
b18d5c1d43 am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 
* commit '8eed37054e8f7dd18aa3ec3070d638e3a1c03eaf':
  You CANNOT change the global WITH_DEXPREOPT
 2014-05-21 18:04:18 +00:00
Baligh Uddin
f5759da88c am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 
* commit '6c915d3a1e820702dca08d02a40fb86aa2de0bdd':
 2014-05-21 18:04:18 +00:00
Ying Wang
82461de508 You CANNOT change the global WITH_DEXPREOPT 
Bug: 14380196
Change-Id: I2b9e6db081558687afd5c20c7084824dfe1bb26e
 2014-05-21 10:59:26 -07:00
Baligh Uddin
709cb7348e keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 2014-05-21 10:59:17 -07:00
Qiwen Zhao
1d50c6b47c reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81 2014-05-13 12:20:14 -07:00
Wink Saville
9db6d437df am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 
* commit '2b549b793713eb10b0212f1c5d6c90d9fdeead85':
  Revert "Merge commit 'e887563a' into fix-merge-conclict"
 2014-05-08 18:31:09 +00:00
Wink Saville
3b0952fb80 Revert "Merge commit 'e887563a' into fix-merge-conclict" 
This reverts commit f65ee55561e2a5f53be6db2ce03e518e249c9e80.

Change-Id: Ia6fed4d96fb4c076b2b51e1d758f3e15d37bffc0
 2014-05-07 16:59:46 -07:00