Remove coroutines flag from proxygen to match velox

czentgr · czentgr · commit ae655a3857c9 · 2026-01-30T23:09:53.000-05:00
diff --git a/.github/workflows/arrow-flight-tests.yml b/.github/workflows/arrow-flight-tests.yml
@@ -60,7 +60,7 @@ jobs:
   prestocpp-linux-build-for-test:
     runs-on: ubuntu-22.04
     container:
-      image: prestodb/presto-native-dependency:0.292-20250204112033-cf8ba84
+      image: prestodb/presto-native-dependency:0.297-202601221815-dcf69f00
     concurrency:
       group: ${{ github.workflow }}-prestocpp-linux-build-for-test-${{ github.event.pull_request.number }}
       cancel-in-progress: true
@@ -154,7 +154,7 @@ jobs:
     needs: prestocpp-linux-build-for-test
     runs-on: ubuntu-22.04
     container:
-      image: prestodb/presto-native-dependency:0.292-20250204112033-cf8ba84
+      image: prestodb/presto-native-dependency:0.297-202601221815-dcf69f00
     env:
       INSTALL_PREFIX: "${{ github.workspace }}/adapter-deps/install"
     strategy:
diff --git a/.github/workflows/prestocpp-linux-adapters-build.yml b/.github/workflows/prestocpp-linux-adapters-build.yml
@@ -11,7 +11,7 @@ jobs:
   prestocpp-linux-adapters-build:
     runs-on: ubuntu-22.04
     container:
-      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      image: prestodb/presto-native-dependency:0.297-202601221815-dcf69f00
     concurrency:
       group: ${{ github.workflow }}-prestocpp-linux-adapters-build-${{ github.event.pull_request.number }}
       cancel-in-progress: true
diff --git a/.github/workflows/prestocpp-linux-build-and-unit-test.yml b/.github/workflows/prestocpp-linux-build-and-unit-test.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: changes
     container:
-      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      image: prestodb/presto-native-dependency:0.297-202601221815-dcf69f00
     concurrency:
       group: ${{ github.workflow }}-prestocpp-linux-build-test-${{ github.event.pull_request.number }}
       cancel-in-progress: true
@@ -135,7 +135,7 @@ jobs:
     needs: [changes, prestocpp-linux-build-for-test]
     runs-on: ubuntu-22.04
     container:
-      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      image: prestodb/presto-native-dependency:0.297-202601221815-dcf69f00
       volumes:
         - /usr:/host_usr
         - /opt:/host_opt
@@ -260,7 +260,7 @@ jobs:
         storage-format: [PARQUET, DWRF]
         enable-sidecar: [true, false]
     container:
-      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      image: prestodb/presto-native-dependency:0.297-202601221815-dcf69f00
       volumes:
         - /usr:/host_usr
         - /opt:/host_opt
@@ -388,7 +388,7 @@ jobs:
       group: ${{ github.workflow }}-prestocpp-linux-presto-on-spark-e2e-tests-${{ matrix.storage-format }}-${{ matrix.enable-sidecar }}-${{ github.event.pull_request.number }}
       cancel-in-progress: true
     container:
-      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      image: prestodb/presto-native-dependency:0.297-202601221815-dcf69f00
       volumes:
         - /usr:/host_usr
         - /opt:/host_opt
@@ -501,7 +501,7 @@ jobs:
     needs: [changes, prestocpp-linux-build-for-test]
     runs-on: ubuntu-22.04
     container:
-      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      image: prestodb/presto-native-dependency:0.297-202601221815-dcf69f00
       volumes:
         - /usr:/host_usr
         - /opt:/host_opt
@@ -613,7 +613,7 @@ jobs:
     needs: [changes, prestocpp-linux-build-for-test]
     runs-on: ubuntu-22.04
     container:
-      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      image: prestodb/presto-native-dependency:0.297-202601221815-dcf69f00
       volumes:
         - /usr:/host_usr
         - /opt:/host_opt
diff --git a/.github/workflows/prestocpp-linux-build.yml b/.github/workflows/prestocpp-linux-build.yml
@@ -26,7 +26,7 @@ jobs:
       contents: read
     needs: changes
     container:
-      image: prestodb/presto-native-dependency:0.297-202512180933-75d7d4ea
+      image: prestodb/presto-native-dependency:0.297-202601221815-dcf69f00
       volumes:
         - /usr:/host_usr
         - /opt:/host_opt
diff --git a/presto-native-execution/CMakeLists.txt b/presto-native-execution/CMakeLists.txt
@@ -77,10 +77,8 @@ option(PRESTO_ENABLE_ARROW_FLIGHT_CONNECTOR "Enable Arrow Flight connector" OFF)
 
 option(PRESTO_ENABLE_SPATIAL "Enable spatial support" ON)
 
-# 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)
+# Turn on folly int128 support.
+add_compile_definitions(FOLLY_HAVE_INT128_T=1)
 
 set(VELOX_ENABLE_S3 ${PRESTO_ENABLE_S3} CACHE BOOL "Build S3 support")
 
diff --git a/presto-native-execution/scripts/setup-centos.sh b/presto-native-execution/scripts/setup-centos.sh
@@ -54,9 +54,6 @@ function install_gperf {
 
 function install_proxygen {
   wget_and_untar https://github.com/facebook/proxygen/archive/refs/tags/${FB_OS_VERSION}.tar.gz proxygen
-  # Folly Portability.h being used to decide whether or not support coroutines
-  # causes issues (build, lin) if the selection is not consistent across users of folly.
-  EXTRA_PKG_CXXFLAGS=" -DFOLLY_CFG_NO_COROUTINES"
   cmake_install_dir proxygen -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON
 }
 
diff --git a/presto-native-execution/scripts/setup-macos.sh b/presto-native-execution/scripts/setup-macos.sh
@@ -28,9 +28,6 @@ DATASKETCHES_VERSION="5.2.0"
 
 function install_proxygen {
   wget_and_untar https://github.com/facebook/proxygen/archive/refs/tags/${FB_OS_VERSION}.tar.gz proxygen
-  # Folly Portability.h being used to decide whether or not support coroutines
-  # causes issues (build, lin) if the selection is not consistent across users of folly.
-  EXTRA_PKG_CXXFLAGS=" -DFOLLY_CFG_NO_COROUTINES"
   cmake_install_dir proxygen -DBUILD_TESTS=OFF
 }
 
diff --git a/presto-native-execution/scripts/setup-ubuntu.sh b/presto-native-execution/scripts/setup-ubuntu.sh
@@ -26,9 +26,6 @@ function install_proxygen {
   ${SUDO} apt update
   ${SUDO} apt install -y gperf python3
   wget_and_untar https://github.com/facebook/proxygen/archive/refs/tags/${FB_OS_VERSION}.tar.gz proxygen
-  # Folly Portability.h being used to decide whether or not support coroutines
-  # causes issues (build, lin) if the selection is not consistent across users of folly.
-  EXTRA_PKG_CXXFLAGS=" -DFOLLY_CFG_NO_COROUTINES"
   cmake_install_dir proxygen -DBUILD_TESTS=OFF
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,6 @@ function install_gperf {`
`54`	`54`
`55`	`55`	`function install_proxygen {`
`56`	`56`	`wget_and_untar https://github.com/facebook/proxygen/archive/refs/tags/${FB_OS_VERSION}.tar.gz proxygen`
`57`		`- # Folly Portability.h being used to decide whether or not support coroutines`
`58`		`- # causes issues (build, lin) if the selection is not consistent across users of folly.`
`59`		`- EXTRA_PKG_CXXFLAGS=" -DFOLLY_CFG_NO_COROUTINES"`
`60`	`57`	`cmake_install_dir proxygen -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON`
`61`	`58`	`}`
`62`	`59`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,6 @@ DATASKETCHES_VERSION="5.2.0"`
`28`	`28`
`29`	`29`	`function install_proxygen {`
`30`	`30`	`wget_and_untar https://github.com/facebook/proxygen/archive/refs/tags/${FB_OS_VERSION}.tar.gz proxygen`
`31`		`- # Folly Portability.h being used to decide whether or not support coroutines`
`32`		`- # causes issues (build, lin) if the selection is not consistent across users of folly.`
`33`		`- EXTRA_PKG_CXXFLAGS=" -DFOLLY_CFG_NO_COROUTINES"`
`34`	`31`	`cmake_install_dir proxygen -DBUILD_TESTS=OFF`
`35`	`32`	`}`
`36`	`33`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,6 @@ function install_proxygen {`
`26`	`26`	`${SUDO} apt update`
`27`	`27`	`${SUDO} apt install -y gperf python3`
`28`	`28`	`wget_and_untar https://github.com/facebook/proxygen/archive/refs/tags/${FB_OS_VERSION}.tar.gz proxygen`
`29`		`- # Folly Portability.h being used to decide whether or not support coroutines`
`30`		`- # causes issues (build, lin) if the selection is not consistent across users of folly.`
`31`		`- EXTRA_PKG_CXXFLAGS=" -DFOLLY_CFG_NO_COROUTINES"`
`32`	`29`	`cmake_install_dir proxygen -DBUILD_TESTS=OFF`
`33`	`30`	`}`
`34`	`31`