This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 6f5638f2f ORC-1973: [C++] Use `int64_t` instead of
`google::protobuf::int64` for `Protobuf` v22+
6f5638f2f is described below
commit 6f5638f2f388f0b667b266eb27b84e70a9b0b603
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Fri Sep 12 11:35:28 2025 -0700
ORC-1973: [C++] Use `int64_t` instead of `google::protobuf::int64` for
`Protobuf` v22+
### What changes were proposed in this pull request?
This PR aims to use `int64_t` instead of `google::protobuf::int64` to
follow ProtocolBuff v22.0 changes.
- https://github.com/protocolbuffers/protobuf/releases/tag/v22.0
> Fixed C++ code generation for protos that use int32_t, uint32_t, int64_t,
uint64_t, size_t as field names.
### Why are the changes needed?
Currently, `branch-2.1` branch CIs are broken like the following.
- https://github.com/apache/orc/pull/2384
-
https://github.com/apache/orc/actions/runs/17682608443/job/50260045180?pr=2384
```
In file included from
/Users/runner/work/orc/orc/c++/src/io/InputStream.cc:19:
/Users/runner/work/orc/orc/c++/src/io/InputStream.hh:75:31: error: no type
named 'int64' in namespace 'google::protobuf'
virtual google::protobuf::int64 ByteCount() const override;
~~~~~~~~~~~~~~~~~~^
/Users/runner/work/orc/orc/c++/src/io/InputStream.cc:115:21: error: no type
named 'int64' in namespace 'google::protobuf'
google::protobuf::int64 SeekableArrayInputStream::ByteCount() const {
~~~~~~~~~~~~~~~~~~^
/Users/runner/work/orc/orc/c++/src/io/InputStream.cc:116:42: error: no type
named 'int64' in namespace 'google::protobuf'
return static_cast<google::protobuf::int64>(position_);
~~~~~~~~~~~~~~~~~~^
3 errors generated.
```
### How was this patch tested?
Pass the CIs.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #2386 from dongjoon-hyun/ORC-1973-2.1.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
c++/src/io/InputStream.cc | 4 ++--
c++/src/io/InputStream.hh | 2 +-
c++/src/io/OutputStream.cc | 4 ++--
c++/src/io/OutputStream.hh | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/c++/src/io/InputStream.cc b/c++/src/io/InputStream.cc
index 06ef40bd4..5e1dc00cc 100644
--- a/c++/src/io/InputStream.cc
+++ b/c++/src/io/InputStream.cc
@@ -112,8 +112,8 @@ namespace orc {
return false;
}
- google::protobuf::int64 SeekableArrayInputStream::ByteCount() const {
- return static_cast<google::protobuf::int64>(position_);
+ int64_t SeekableArrayInputStream::ByteCount() const {
+ return static_cast<int64_t>(position_);
}
void SeekableArrayInputStream::seek(PositionProvider& seekPosition) {
diff --git a/c++/src/io/InputStream.hh b/c++/src/io/InputStream.hh
index 07aa623b5..8b251c930 100644
--- a/c++/src/io/InputStream.hh
+++ b/c++/src/io/InputStream.hh
@@ -72,7 +72,7 @@ namespace orc {
virtual bool Next(const void** data, int* size) override;
virtual void BackUp(int count) override;
virtual bool Skip(int count) override;
- virtual google::protobuf::int64 ByteCount() const override;
+ virtual int64_t ByteCount() const override;
virtual void seek(PositionProvider& position) override;
virtual std::string getName() const override;
};
diff --git a/c++/src/io/OutputStream.cc b/c++/src/io/OutputStream.cc
index fbf1ca61d..a55050d12 100644
--- a/c++/src/io/OutputStream.cc
+++ b/c++/src/io/OutputStream.cc
@@ -65,8 +65,8 @@ namespace orc {
// PASS
}
- google::protobuf::int64 BufferedOutputStream::ByteCount() const {
- return static_cast<google::protobuf::int64>(dataBuffer_->size());
+ int64_t BufferedOutputStream::ByteCount() const {
+ return static_cast<int64_t>(dataBuffer_->size());
}
bool BufferedOutputStream::WriteAliasedRaw(const void*, int) {
diff --git a/c++/src/io/OutputStream.hh b/c++/src/io/OutputStream.hh
index 6319de96d..b02981812 100644
--- a/c++/src/io/OutputStream.hh
+++ b/c++/src/io/OutputStream.hh
@@ -61,7 +61,7 @@ namespace orc {
virtual bool Next(void** data, int* size) override;
virtual void BackUp(int count) override;
- virtual google::protobuf::int64 ByteCount() const override;
+ virtual int64_t ByteCount() const override;
virtual bool WriteAliasedRaw(const void* data, int size) override;
virtual bool AllowsAliasing() const override;
