Skip to content

Commit 65a5f04

Browse files
kevintang2022facebook-github-bot
authored andcommitted
[presto] Revert folly shim changes in presto-trunk that failed to sync to GitHub (#27541)
Summary: D97588318 and D97588319 updated folly references in presto-trunk from `folly/experimental/EventCount.h` to `folly/synchronization/EventCount.h` and `folly/experimental/FunctionScheduler.h` to `folly/executors/FunctionScheduler.h`. These changes could not be merged on GitHub by the meta-codesync bot because it lacks committer permissions on the `prestodb/presto` org (same root cause as T256517905). This caused DiffTrain to fail consecutively (T263737022). Reverting the presto-trunk portion of these diffs so that fbsource stays in sync with the GitHub OSS repo. The folly shim headers still forward to the correct location, so this is safe. Reviewed By: amitkdutta Differential Revision: D99902390
1 parent 65cf3e9 commit 65a5f04

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

presto-native-execution/presto_cpp/main/PeriodicMemoryChecker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* limitations under the License.
1313
*/
1414
#pragma once
15-
#include <folly/executors/FunctionScheduler.h>
15+
#include <folly/experimental/FunctionScheduler.h>
1616
#include <cstdint>
1717
#include <queue>
1818
#include <string>

presto-native-execution/presto_cpp/main/PeriodicTaskManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
#pragma once
1515

16-
#include <folly/executors/FunctionScheduler.h>
16+
#include <folly/experimental/FunctionScheduler.h>
1717
#include <folly/executors/ThreadedRepeatingFunctionRunner.h>
1818
#include "velox/common/memory/Memory.h"
1919

presto-native-execution/presto_cpp/main/tests/PrestoExchangeSourceTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include <boost/algorithm/string.hpp>
1919
#include <boost/filesystem.hpp>
20-
#include "folly/synchronization/EventCount.h"
20+
#include "folly/experimental/EventCount.h"
2121
#include "presto_cpp/main/PrestoExchangeSource.h"
2222
#include "presto_cpp/main/common/Utils.h"
2323
#include "presto_cpp/main/common/tests/MutableConfigs.h"

presto-native-execution/presto_cpp/main/tests/TaskManagerTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <folly/executors/ThreadedExecutor.h>
1616
#include <gmock/gmock.h>
1717
#include <gtest/gtest.h>
18-
#include "folly/synchronization/EventCount.h"
18+
#include "folly/experimental/EventCount.h"
1919
#include "presto_cpp/main/PrestoExchangeSource.h"
2020
#include "presto_cpp/main/TaskResource.h"
2121
#include "presto_cpp/main/common/Exception.h"

0 commit comments

Comments
 (0)