AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
9,011 Commits 35 Branches 138 Tags 124 MiB
937b56f57b
Commit Graph

469 Commits

Author SHA1 Message Date
Deanna Garcia
506f2273d1 Merging 3.17.x branch into master 2021-06-02 22:29:40 +00:00
Paul Yang
bd42fcc7a3
Merge pull request #8652 from haberman/sync-stage 
Integrate from Piper for C++, Java, and Python
 2021-06-01 15:20:53 -07:00
Adam Cozzette
d2f6d9b721
Merge pull request #8650 from acozzette/merge-3.17.x 
Merge 3.17.x into master
 2021-05-27 08:05:54 -07:00
Deanna Garcia
5b8208ecea Update protobuf version 2021-05-25 19:36:05 +00:00
Joshua Haberman
a8d8eb17df Merge tag 'refs/tags/sync-piper' into sync-stage 2021-05-24 13:49:40 -07:00
Joshua Haberman
9521803d40 Sync from Piper @375548932 
PROTOBUF_SYNC_PIPER
 2021-05-24 13:49:39 -07:00
Adam Cozzette
52784ced2f
Update protobuf version (#8633) 2021-05-19 16:43:44 -07:00
Deanna Garcia
cab253ec5e Removing python_protobuf.h/cc 2021-05-14 22:35:38 +00:00
Deanna Garcia
f66dea481d Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
#	src/google/protobuf/repeated_field_unittest.cc
 2021-05-14 21:56:03 +00:00
Deanna Garcia
380e352b0b Sync from Piper @373820256 
PROTOBUF_SYNC_PIPER
 2021-05-14 17:50:31 +00:00
Adam Cozzette
652d99a8ee
Update protobuf version (#8606) 2021-05-12 16:20:18 -07:00
Adam Cozzette
f807c02226
Update protobuf version to 3.17.0-rc2 (#8586) 
* Update protobuf version

* Updated Kotlin versions and updated script to handle them
 2021-05-10 15:31:35 -07:00
Adam Cozzette
7025f37cde
Update protobuf version (#8575) 2021-05-07 09:51:15 -07:00
Yuriy Chernyshov
c8389f8ed5
Fix constness issue detected by MSVC standard conforming mode (#8568) 
This is the continuation of #8344
 2021-05-06 09:09:22 -07:00
Joshua Haberman
535ddf1c4f Merge tag 'refs/tags/sync-piper' into sync-stage 2021-04-30 16:12:51 -07:00
Joshua Haberman
f5fd897c1d Sync from Piper @371422642 
PROTOBUF_SYNC_PIPER
 2021-04-30 16:12:50 -07:00
Yuriy Chernyshov
c784b65b2a
Remove unused python_protobuf.{cc,h} (#8513) 
* Remove unused python_protobuf.{cc,h} #8513

* Fix automake input
 2021-04-19 15:58:33 -07:00
Joshua Haberman
ba3836703b Sync from Piper @368866736 
PROTOBUF_SYNC_PIPER
 2021-04-16 09:55:03 -07:00
Joshua Haberman
c5c33d29dd Merge tag 'refs/tags/sync-piper' into sync-stage 2021-04-16 09:55:03 -07:00
Joshua Haberman
e8cb1b8da2 Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	src/google/protobuf/compiler/cpp/cpp_helpers.cc
#	src/google/protobuf/port_def.inc
 2021-04-15 16:03:26 -07:00
Joshua Haberman
ce560630bf Sync from Piper @368734211 
PROTOBUF_SYNC_PIPER
 2021-04-15 15:53:17 -07:00
Adam Cozzette
5679811239 Merge branch '3.15.x' into merge-3-15-x 2021-04-08 10:54:02 -07:00
Adam Cozzette
436bd7880e
Updated version to 3.15.8 (#8463) 
* Update protobuf version

* Updated CHANGES.txt and package.xml for 3.15.8
 2021-04-07 15:38:38 -07:00
Matt Fowles Kulukundis
c2148566c7
Merge pull request #8327 from alkasm/alkasm/method-desc-copy-to-proto 
[python-runtime] Add MethodDescriptor.CopyToProto()
 2021-04-07 16:02:22 -04:00
Alexander Reynolds
3c782fc3d6 Remove py impl skip for method desc CopyToProto test 2021-04-07 02:21:46 -07:00
Adam Cozzette
87aa9adb86 Merge branch 'master' into 3.15.x 2021-04-02 14:55:02 -07:00
Adam Cozzette
878be3569e Update protobuf version 2021-04-02 11:06:56 -07:00
Joshua Haberman
4a6dc34d3a Sync from Piper @365872496 
PROTOBUF_SYNC_PIPER
 2021-03-30 12:37:31 -07:00
Joshua Haberman
96307d28f6 Sync from Piper @364389596 
PROTOBUF_SYNC_PIPER
 2021-03-22 13:05:55 -07:00
Joshua Haberman
77334e39a7 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-03-22 13:05:55 -07:00
Adam Cozzette
9db84d08fb Merge branch '3.15.x' into merge-3-15-x 2021-03-12 15:05:10 -08:00
Adam Cozzette
6aa539bf01 Update protobuf version 2021-03-10 14:53:26 -08:00
Adam Cozzette
673971834c
Merge branch 'master' into 3.15.x 2021-03-04 17:53:03 -08:00
Adam Cozzette
4fff47a418 Update protobuf version 2021-03-04 13:35:04 -08:00
Alexander Shadchin
87dd07b436
Switch on "new" buffer API (#8339) 
"Old" buffer API will removed in Python 3.10. This is also fix #7930.
 2021-03-04 11:00:41 -08:00
Adam Cozzette
13fa25013a Merge branch '3.15.x' into 3.15.x-202103031418 2021-03-03 14:29:11 -08:00
Adam Cozzette
fd8aabf32d Update protobuf version 2021-03-03 11:37:48 -08:00
Yuriy Chernyshov
e9091e6d8c
Fix some constness / char literal issues being found by MSVC standard conforming mode (#8344) 
* Fix some constness / char literal issues being found by MSVC standard conforming mode

* Switch to const_cast from C-style casts
 2021-03-01 12:59:39 -08:00
Adam Cozzette
983d115bd9 Update protobuf version 2021-02-25 09:20:20 -08:00
Adam Cozzette
d7e943b8d2 Update protobuf version 2021-02-23 13:21:42 -08:00
Alexander Reynolds
393e453033 Add MethodDescriptor.CopyToProto() 2021-02-22 02:25:37 -08:00
Adam Cozzette
052dc799d2 Update protobuf version 2021-02-19 15:12:24 -08:00
Adam Cozzette
133e5e7526 Update protobuf version 2021-02-18 16:53:24 -08:00
Adam Cozzette
de701c660b Update protobuf version 2021-02-18 16:53:24 -08:00
Adam Cozzette
ac9218c5d9 Update protobuf version 2021-02-18 16:53:24 -08:00
Adam Cozzette
ae50d9b990 Update protobuf version 2021-02-18 11:50:15 -08:00
Adam Cozzette
8260126500 Update protobuf version 2021-02-17 10:51:33 -08:00
Adam Cozzette
e9f2ef308c Update protobuf version 2021-02-05 15:37:10 -08:00
Deanna Garcia
a00125024e Sync from Piper @353127564 
PROTOBUF_SYNC_PIPER
 2021-01-22 00:24:30 +00:00
panda
74056a0e28 Make MessageToDict convert map keys to strings 2020-12-04 13:38:45 -08:00
Joshua Haberman
c2c13a558a Fixed Python C++ extension for Python 3.8. 
Python 3.8 changed the meaning and type of the tp_print slot.
 2020-11-20 13:20:55 -08:00
Joshua Haberman
5c028d6cf4 Sync from Piper @343521567 
PROTOBUF_SYNC_PIPER
 2020-11-20 10:44:58 -08:00
Joshua Haberman
920803e18d Merge tag 'refs/tags/sync-piper' into sync-stage 2020-11-20 10:44:58 -08:00
Adam Cozzette
f3192d6128 Update protobuf version 2020-11-13 11:27:32 -08:00
Adam Cozzette
1b851b3fe6 Update protobuf version 2020-11-12 12:44:26 -08:00
Aurélien Grenotton
99149badc0 Fix PyUnknownFields memory leak (#7928) 
Properly release internal data structure on deallocation.
Fix #7301
 2020-11-12 12:31:39 -08:00
Adam Cozzette
a8ab1fade9 Update protobuf version 2020-11-10 17:15:32 -08:00
Adam Cozzette
27100b40fd Update protobuf version 2020-11-05 14:30:53 -08:00
Joshua Haberman
b70695dd68 Sync from Piper @338707351 
PROTOBUF_SYNC_PIPER
 2020-10-23 11:07:04 -07:00
Joshua Haberman
73ac11febe Merge tag 'refs/tags/sync-piper' into sync-stage 2020-10-23 11:07:04 -07:00
Joshua Haberman
de371235c9 Sync from Piper @338284531 
PROTOBUF_SYNC_PIPER
 2020-10-21 10:04:14 -07:00
Joshua Haberman
820d1ca5af Merge tag 'refs/tags/sync-piper' into sync-stage 2020-10-21 10:04:14 -07:00
Joshua Haberman
aefc1e7670 Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	conformance/failure_list_js.txt
#	src/google/protobuf/generated_message_reflection.h
 2020-09-28 11:55:10 -07:00
Joshua Haberman
38d6de1eef Sync from Piper @334206209 
PROTOBUF_SYNC_PIPER
 2020-09-28 11:54:54 -07:00
David L. Jones
66e3562aaf
Remove uses of pkg_resources in non-namespace packages. (#7902) 
In #713 and #1296, the `google` package in protobuf sources was found
to cause conflicts with other Google projects, because it was not
properly configured as a namespace package [1]. The initial fix in
786f80f addressed part of the issue, and #1298 fixed the rest.

However, 786f80f (the initial fix) also made `google.protobuf` and
`google.protobuf.pyext` into namespace packages. This was not correct:
they are both regular, non-namespace, sub-subpackages.

However (still), the follow-up #1298 did not nominate them as
namespace packages, so the namespace registration behavior has
remained, but without benefit.

This change removes the unnecessary namespace registration, which has
substantial overhead, thus reducing startup time substantially when
using protobufs.

Because this change affects the import internals, quantifying the
overhead requires a full tear-down/start-up of the Python interpreter.
So, to capture the full cost for every run, I measured the time to
launching a _fresh_ Python instance in a subprocess, varying the
imports and code under test. In other words, I used `timeit` to
measure the time to launch a _fresh_ Python subprocess which actually
performs the imports.

* Reference: normal Python startup (i.e., don't import protobuf at all).
  ```
   % python3 -m timeit -s 'import subprocess' -r 3 -n 10 'subprocess.call(["python3", "-c", "pass"])'
  10 loops, best of 3: 27.1 msec per loop
  ```

* Baseline: cost to import `google.protobuf.descriptor`, with
  extraneous namespace packages.
  ```
  % python3 -m timeit -s 'import subprocess' -r 3 -n 10 'subprocess.call(["python3", "-c", "import google.protobuf.descriptor"])'
  10 loops, best of 3: 133 msec per loop
  ```

* This change: cost to import `google.protobuf.descriptor`, without
  extraneous namespace packages.
  ```
  % python3 -m timeit -s 'import subprocess' -r 3 -n 10 'subprocess.call(["python3", "-c", "import google.protobuf.descriptor"])'
  10 loops, best of 3: 43.1 msec per loop
  ```

[1]:  https://packaging.python.org/guides/packaging-namespace-packages/
 2020-09-22 20:46:07 -07:00
Joshua Haberman
f3cf99c0fb Sync from Piper @328224070 
PROTOBUF_SYNC_PIPER
 2020-08-24 15:48:43 -07:00
Joshua Haberman
32a94ce353 Merge tag 'refs/tags/sync-piper' into sync-stage 
# Conflicts:
#	csharp/src/Google.Protobuf.Test/testprotos.pb
 2020-08-17 15:26:33 -07:00
Joshua Haberman
95e6c5b474 Sync from Piper @327110949 
PROTOBUF_SYNC_PIPER
 2020-08-17 15:26:13 -07:00
Adam Cozzette
58f4260e8e Merged 3.13.x into master 2020-08-17 11:06:11 -07:00
Adam Cozzette
fde7cf7358 Update protobuf version 2020-08-14 15:20:53 -07:00
Adam Cozzette
98c2e69f8c Update protobuf version 2020-08-12 14:49:20 -07:00
Peter Newman
e2cc2de304
Fix lots of spelling errors (#7751) 
* Fix a typo

* Fix lots of spelling errors

* Fix a few more spelling mistakes

* s/parsable/parseable/

* Don't touch the third party files

* Cloneable is the preferred C# term

* Copyable is the preferred C++ term

* Revert "s/parsable/parseable/"

This reverts commit 534ecf7675.

* Revert unparseable->unparsable corrections
 2020-08-10 11:08:25 -07:00
Adam Cozzette
1c587a8059 Updated version to 3.13.0-rc2 2020-08-07 14:44:49 -07:00
Adam Cozzette
8940150706 Updated version to 3.13.0-rc1. 2020-08-07 14:44:49 -07:00
Joshua Haberman
6ba52411d0 Sync from Piper @320514613 
PROTOBUF_SYNC_PIPER
 2020-07-09 18:17:47 -07:00
Joshua Haberman
25755efc4f Sync from Piper @319848517 
PROTOBUF_SYNC_PIPER
 2020-07-06 13:54:50 -07:00
Joshua Haberman
dfab275eca Sync from Piper @317197168 
PROTOBUF_SYNC_PIPER
 2020-06-18 15:47:49 -07:00
Joshua Haberman
f47e9345a9 Merge branch 'sync-piper' into sync-stage 2020-06-15 12:03:54 -07:00
Joshua Haberman
f77065d4eb Sync from Piper @316511779 
PROTOBUF_SYNC_PIPER
 2020-06-15 11:48:47 -07:00
Joshua Haberman
b971243fe0 Merge branch '3.12.x' into merge-release-branch 2020-06-02 13:24:30 -07:00
Joshua Haberman
183cdec7cd Sync from Piper @314226556 
PROTOBUF_SYNC_PIPER
 2020-06-01 16:32:31 -07:00
Joshua Haberman
9ce8c330e7
Updated version to 3.12.3 and updated CHANGES.txt. (#7580) 
* Updated version to 3.12.3 and updated CHANGES.txt.

* Re-ran generate_descriptor_protos.sh and made it more parallel.
 2020-06-01 13:36:50 -07:00
Joshua Haberman
c077d949d8 Merge branch '3.12.x' into merge-312 2020-05-26 16:45:43 -07:00
Joshua Haberman
beeb621f50
Update protobuf version (#7557) 2020-05-26 15:46:39 -07:00
Joshua Haberman
eee43838f3 Merge branch 'sync-piper' into sync-stage 
# Conflicts:
#	java/core/src/test/java/com/google/protobuf/TextFormatTest.java
 2020-05-26 00:26:47 -07:00
Joshua Haberman
0a737d8eb0 Sync from Piper @313142438 
PROTOBUF_SYNC_PIPER
 2020-05-26 00:26:15 -07:00
Joshua Haberman
6ad138d85a
Update protobuf version (#7535) 2020-05-20 10:54:29 -07:00
Joshua Haberman
9952e36f92
Merge release branch into master. (#7517) 
* Added background information about proto3 presence. (#7501)

* Fixed bug in map key sorting for Java TextFormat. (#7508)

Fixes: https://github.com/protocolbuffers/protobuf/issues/7505

* Update protobuf version

* Added a changelog entry about the Java fix. (#7516)
 2020-05-16 16:42:02 -07:00
Joshua Haberman
e90b71cdee Update protobuf version 2020-05-15 13:28:07 -07:00
Joshua Haberman
62ab8333c9 Merge branch '3.12.x' into merge-312-branch 2020-05-12 16:59:55 -07:00
Joshua Haberman
f597a24627 Update protobuf version 2020-05-12 12:49:46 -07:00
Joshua Haberman
01e8c0fa34 Cherry-pick the fix to #7480 from #7485. 2020-05-12 11:34:02 -07:00
Joshua Haberman
6b5fb807c0 Sync from Piper @310858019 
PROTOBUF_SYNC_PIPER
 2020-05-11 00:12:20 -07:00
Joshua Haberman
2d80a70048 Sync from Piper @310457838 
PROTOBUF_SYNC_PIPER
 2020-05-07 16:21:50 -07:00
Joshua Haberman
c05b55880f Sync from Piper @309848308 
PROTOBUF_SYNC_PIPER
 2020-05-04 17:10:15 -07:00
Joshua Haberman
a9f11d7d64
Updated version to 3.12.0-rc1. (#7449) 2020-04-30 15:34:10 -07:00
Joshua Haberman
32e5deb1ac Sync from Piper @308829107 
PROTOBUF_SYNC_PIPER
 2020-04-28 08:40:38 -07:00
Joshua Haberman
bb30225f06 Sync from Piper @307316823 
PROTOBUF_SYNC_PIPER
 2020-04-19 18:01:44 -07:00
Joshua Haberman
fb32b5a343 Sync from Piper @305960231 
PROTOBUF_SYNC_PIPER
 2020-04-10 15:57:18 -07:00
Joshua Haberman
b7742c51fd Sync from Piper @305505267 
PROTOBUF_SYNC_PIPER
 2020-04-08 10:30:17 -07:00