Skip to content

Commit 3138051

Browse files
Bump C++ client to 4.1.0 (#293)
1 parent bb63296 commit 3138051

File tree

7 files changed

+10
-18
lines changed

7 files changed

+10
-18
lines changed

.github/workflows/ci-build-release-wheels.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ jobs:
5555
uses: actions/checkout@v3
5656

5757
- name: Set up QEMU
58-
uses: docker/setup-qemu-action@v2
58+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
5959

60-
- uses: docker/setup-buildx-action@v2
60+
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
6161

6262
- name: Build Manylinux Docker image
63-
uses: docker/build-push-action@v3
63+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
6464
with:
6565
context: ./pkg/${{matrix.image.name}}
6666
load: true

.github/workflows/ci-pr-validation.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@ jobs:
124124
uses: actions/checkout@v3
125125

126126
- name: Set up QEMU
127-
uses: docker/setup-qemu-action@v2
127+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
128128

129-
- uses: docker/setup-buildx-action@v2
129+
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
130130

131131
- name: Build Manylinux Docker image
132-
uses: docker/build-push-action@v3
132+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
133133
with:
134134
context: ./pkg/${{matrix.image.name}}
135135
load: true

dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under the License.
1818
#
1919

20-
pulsar-cpp: 4.0.1
20+
pulsar-cpp: 4.1.0
2121
pybind11: 3.0.1
2222
# The OpenSSL dependency is only used when building Python from source
2323
openssl: 1.1.1q

pkg/manylinux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ ENV ARCH=${ARCH}
3333

3434
RUN pip3 install setuptools
3535
# Dependencies for vcpkg on arm64 architecture
36-
RUN yum install -y curl zip unzip tar perl-IPC-Cmd
36+
RUN yum install -y curl zip unzip tar perl-IPC-Cmd perl-Time-Piece

pulsar/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -709,8 +709,7 @@ def __init__(self, service_url,
709709
Set the interval between each stats information update. Stats are printed and/or
710710
passed to the statistics listener at this interval. Set to 0 to disable stats collection.
711711
use_tls: bool, default=False
712-
Configure whether to use TLS encryption on the connection. This setting is deprecated.
713-
TLS will be automatically enabled if the ``serviceUrl`` is set to ``pulsar+ssl://`` or ``https://``
712+
it's a deprecated config that never works, whether TLS is enabled is determined by ``service_url``.
714713
tls_trust_certs_file_path: str, optional
715714
Set the path to the trusted TLS certificate file. If empty defaults to certifi.
716715
tls_allow_insecure_connection: bool, default=False
@@ -782,8 +781,6 @@ def __init__(self, service_url,
782781

783782
if listener_name:
784783
conf.listener_name(listener_name)
785-
if use_tls or service_url.startswith('pulsar+ssl://') or service_url.startswith('https://'):
786-
conf.use_tls(True)
787784
if tls_trust_certs_file_path:
788785
conf.tls_trust_certs_file_path(tls_trust_certs_file_path)
789786
else:

src/config.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,6 @@ void export_config(py::module_& m) {
174174
.def("stats_interval_in_seconds", &ClientConfiguration::getStatsIntervalInSeconds)
175175
.def("stats_interval_in_seconds", &ClientConfiguration::setStatsIntervalInSeconds,
176176
return_value_policy::reference)
177-
.def("use_tls", &ClientConfiguration::isUseTls)
178-
.def("use_tls", &ClientConfiguration::setUseTls, return_value_policy::reference)
179-
.def("tls_trust_certs_file_path", &ClientConfiguration::getTlsTrustCertsFilePath,
180-
return_value_policy::copy)
181177
.def("tls_trust_certs_file_path", &ClientConfiguration::setTlsTrustCertsFilePath,
182178
return_value_policy::reference)
183179
.def("tls_private_key_file_path", &ClientConfiguration::getTlsPrivateKeyFilePath,

tests/asyncio_test.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ async def test_batch_end_to_end(self):
9393
msg_ids = await asyncio.gather(*tasks)
9494
self.assertEqual(len(msg_ids), 5)
9595
# pylint: disable=fixme
96-
# TODO: the result is wrong due to https://github.com/apache/pulsar-client-cpp/issues/531
97-
self.assertEqual(producer.last_sequence_id(), 8)
96+
self.assertEqual(producer.last_sequence_id(), 4)
9897
ledger_id = msg_ids[0].ledger_id()
9998
entry_id = msg_ids[0].entry_id()
10099
# These messages should be in the same entry

0 commit comments

Comments
 (0)