Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion presto-native-execution/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SCRIPT_CXX_FLAGS}")
set(DISABLED_WARNINGS
"-Wno-nullability-completeness -Wno-deprecated-declarations")

if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "14.0.0")
string(APPEND DISABLED_WARNINGS " -Wno-error=template-id-cdtor")
endif()
endif()

# Important warnings that must be explicitly enabled.
set(ENABLE_WARNINGS "-Wreorder")

Expand Down Expand Up @@ -221,7 +227,7 @@ include_directories(SYSTEM ${FBTHRIFT_INCLUDE_DIR})
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")
set(PROXYGEN_INCLUDE_DIR "${PROXYGEN_DIR}/include/")

include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR} ${PROXYGEN_INCLUDE_DIR})
include_directories(.)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ TEST_F(BinarySortableSerializerTest, ArrayTypeSingleFieldTests) {
// null < []
EXPECT_TRUE(
singleArrayFieldCompare<int64_t>(
{std::nullopt, {{}}}, velox::core::kAscNullsFirst) < 0);
{std::nullopt, {std::vector<std::optional<int64_t>>{}}}, velox::core::kAscNullsFirst) < 0);
}

TEST_F(BinarySortableSerializerTest, RowTypeSingleFieldTests) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ TEST_F(BroadcastTest, endToEndSerdeLayout) {
runBroadcastTest({data}, {{"c1", "c1", "c2"}});

// Skip all.
runBroadcastTest({data}, {{}});
runBroadcastTest({data}, {std::vector<std::string>{}});
}

TEST_F(BroadcastTest, endToEndWithNoRows) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/
#pragma once
#include <re2/re2.h>
#include <chrono>
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: Curious again why you had to add this ?

Copy link
Contributor

Choose a reason for hiding this comment

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

NVM - I see that in the description.


namespace facebook::presto::protocol {

Expand Down
Loading