Skip to content

[native] Update to use C++20 #25636

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
aditi-pandit merged 1 commit into from
Jul 31, 2025
Merged

[native] Update to use C++20 #25636

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
11 changes: 6 additions & 5 deletions presto-native-execution/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ execute_process(
OUTPUT_VARIABLE SCRIPT_CXX_FLAGS
RESULT_VARIABLE COMMAND_STATUS)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED True)
message("Appending CMAKE_CXX_FLAGS with ${SCRIPT_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SCRIPT_CXX_FLAGS}")
Expand Down Expand Up @@ -70,9 +70,9 @@ option(PRESTO_ENABLE_JWT "Enable JWT (JSON Web Token) authentication" OFF)

option(PRESTO_ENABLE_ARROW_FLIGHT_CONNECTOR "Enable Arrow Flight connector" OFF)

# Set all Velox options below
# Make sure that if we include folly headers or other dependency headers
# that include folly headers we turn off the coroutines and turn on int128.
# Set all Velox options below and make sure that if we include folly headers or
# other dependency headers that include folly headers we turn off the coroutines
# and turn on int128.
add_compile_definitions(FOLLY_HAVE_INT128_T=1 FOLLY_CFG_NO_COROUTINES)

if(PRESTO_ENABLE_S3)
Expand Down Expand Up @@ -210,7 +210,8 @@ find_package(wangle CONFIG)
find_package(FBThrift)
include_directories(SYSTEM ${FBTHRIFT_INCLUDE_DIR})

set(PROXYGEN_LIBRARIES ${PROXYGEN_HTTP_SERVER} ${PROXYGEN} ${WANGLE} ${FIZZ} ${MVFST_EXCEPTION})
set(PROXYGEN_LIBRARIES ${PROXYGEN_HTTP_SERVER} ${PROXYGEN} ${WANGLE} ${FIZZ}
${MVFST_EXCEPTION})
find_path(PROXYGEN_DIR NAMES include/proxygen)
set(PROXYGEN_INCLUDE_DIR "${PROXYGEN_DIR}/include/proxygen")

Expand Down
11 changes: 6 additions & 5 deletions presto-native-execution/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,19 @@ The supported architectures are `x86_64 (avx, sse)`, and `AArch64 (apple-m1+crc,
Prestissimo can be built by a variety of compilers (and versions) but not all.
Compilers (and versions) not mentioned are known to not work or have not been tried.

#### Recommended
#### Minimum required
| OS | compiler |
| -- | -------- |
| CentOS 9/RHEL 9 | `gcc12` |
| Ubuntu 22.04 | `gcc11` |
| macOS | `clang15` |
| CentOS 9/RHEL 9 | `gcc11` |

#### Older alternatives
#### Recommended
| OS | compiler |
| -- | -------- |
| Ubuntu 20.04 | `gcc9` |
| macOS | `clang14` |
| CentOS 9/RHEL 9 | `gcc12` |
| Ubuntu 22.04 | `gcc11` |
| macOS | `clang15 (or later)` |

### Build Prestissimo
#### Parquet and S3 Support
Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/main/http/HttpClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ folly::SemiFuture<std::unique_ptr<HttpResponse>> HttpClient::sendRequest(
if (eventBase_ != nullptr) {
if (delayMs > 0) {
// schedule() is expected to be run in the event base thread
eventBase_->runInEventBaseThread([=]() {
eventBase_->runInEventBaseThread([=, this]() {
eventBase_->schedule(sendCb, std::chrono::milliseconds(delayMs));
});
} else {
Expand Down
9 changes: 6 additions & 3 deletions presto-native-execution/presto_cpp/main/types/tests/FunctionMetadataTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,15 @@ class FunctionMetadataTest : public ::testing::Test {
EXPECT_EQ(metadataList.size(), expectedSize);
std::string expectedStr = slurp(test::utils::getDataPath(expectedFile));
auto expected = json::parse(expectedStr);
auto comparator = [](const json& a, const json& b) {

@PingLiuPing PingLiuPing Jul 30, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this relate to C++ 20 compiler upgrade?

@czentgr czentgr Jul 31, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. The comparator behaved differently.

@PingLiuPing PingLiuPing Jul 31, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

return (a["outputType"] < b["outputType"]);
};

json::array_t expectedList = expected[name];
std::sort(expectedList.begin(), expectedList.end());
std::sort(metadataList.begin(), metadataList.end());
std::sort(expectedList.begin(), expectedList.end(), comparator);
std::sort(metadataList.begin(), metadataList.end(), comparator);
for (auto i = 0; i < expectedSize; i++) {
EXPECT_EQ(expectedList[i], metadataList[i]);
EXPECT_EQ(expectedList[i], metadataList[i]) << "Position: " << i;
}
}

Expand Down
Loading