Skip to content

branch-3.0: [fix](thrift) Pick THRIFT-5492: Add readEnd to TBufferedTransport #49649 #49655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataroaring merged 1 commit into from
Mar 30, 2025
Merged

branch-3.0: [fix](thrift) Pick THRIFT-5492: Add readEnd to TBufferedTransport #49649 #49655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions thirdparty/download-thirdparty.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,4 +521,21 @@ else
fi
fi

# patch thrift
if [[ " ${TP_ARCHIVES[*]} " =~ " THRIFT " ]]; then
if [[ "${THRIFT_SOURCE}" == 'thrift-0.16.0' ]]; then
cd "${TP_SOURCE_DIR}/${THRIFT_SOURCE}"
if [[ ! -f "${PATCHED_MARK}" ]]; then
for patch_file in "${TP_PATCH_DIR}"/thrift-0.16*; do
echo "patch ${patch_file}"
patch -p1 --ignore-whitespace <"${patch_file}"
done
touch "${PATCHED_MARK}"
fi
cd -
fi
echo "Finished patching ${THRIFT_SOURCE}"
fi


# vim: ts=4 sw=4 ts=4 tw=100:
29 changes: 29 additions & 0 deletions thirdparty/patches/thrift-0.16-reset-consumed-message-size.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 89e0bc5fa4949b68503f7b6892128cc8fc5bc1d4 Mon Sep 17 00:00:00 2001
From: Steve Licking <steve.licking@intel.com>
Date: Fri, 31 Dec 2021 10:54:05 -0800
Subject: [PATCH] THRIFT-5492: Add readEnd to TBufferedTransport client: cpp
Patch: Steve Licking

---
lib/cpp/src/thrift/transport/TBufferTransports.h | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/lib/cpp/src/thrift/transport/TBufferTransports.h b/lib/cpp/src/thrift/transport/TBufferTransports.h
index 179934ba0..6feb540af 100644
--- a/lib/cpp/src/thrift/transport/TBufferTransports.h
+++ b/lib/cpp/src/thrift/transport/TBufferTransports.h
@@ -270,6 +270,11 @@ public:
*/
uint32_t readAll(uint8_t* buf, uint32_t len) { return TBufferBase::readAll(buf, len); }

+ uint32_t readEnd() override {
+ resetConsumedMessageSize();
+ return 0;
+ }
+
protected:
void initPointers() {
setReadBuffer(rBuf_.get(), 0);
--
2.39.3

Loading