Skip to content

convert MemoryManagerOptions to MemoryManager::Options #25229

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
skyelves merged 1 commit into from
May 30, 2025
Merged

convert MemoryManagerOptions to MemoryManager::Options #25229

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
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/main/PrestoServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ void PrestoServer::initializeVeloxMemory() {
PRESTO_STARTUP_LOG(INFO) << "Starting with node memory " << memoryGb << "GB";

// Set up velox memory manager.
velox::memory::MemoryManagerOptions options;
velox::memory::MemoryManager::Options options;
options.allocatorCapacity = memoryGb << 30;
if (systemConfig->useMmapAllocator()) {
options.useMmapAllocator = true;
Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/main/http/tests/HttpJwtTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class HttpJwtTestSuite : public ::testing::TestWithParam<bool> {

protected:
static void SetUpTestCase() {
memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
}

std::unique_ptr<config::ConfigBase> jwtSystemConfig(
Expand Down
4 changes: 2 additions & 2 deletions presto-native-execution/presto_cpp/main/http/tests/HttpTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ int main(int argc, char** argv) {
class HttpsBasicTest : public ::testing::Test {
protected:
static void SetUpTestCase() {
memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
}
};

Expand Down Expand Up @@ -64,7 +64,7 @@ class HttpTestSuite : public ::testing::TestWithParam<bool> {

protected:
static void SetUpTestCase() {
memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
}

std::unique_ptr<http::HttpServer> getServer(
Expand Down
2 changes: 1 addition & 1 deletion ...tive-execution/presto_cpp/main/operators/benchmarks/BinarySortableSerializerBenchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ BENCHMARK(structsSerialize) {
int main(int argc, char** argv) {
folly::Init init{&argc, &argv};
facebook::velox::memory::MemoryManager::initialize(
facebook::velox::memory::MemoryManagerOptions{});
facebook::velox::memory::MemoryManager::Options{});
folly::runBenchmarks();
return 0;
}
4 changes: 2 additions & 2 deletions presto-native-execution/presto_cpp/main/operators/tests/BinarySortableSerializerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class BinarySortableSerializerTest : public ::testing::Test,
public velox::test::VectorTestBase {
protected:
static void SetUpTestCase() {
velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManagerOptions{});
velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManager::Options{});
}

int compareRowVector(
Expand Down Expand Up @@ -142,7 +142,7 @@ class BinarySortableSerializerFuzzerTest : public ::testing::Test,
public velox::test::VectorTestBase {
protected:
static void SetUpTestCase() {
velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManagerOptions{});
velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManager::Options{});
}

void runFuzzerTest(const velox::RowTypePtr& rowType) {
Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/main/operators/tests/PlanNodeSerdeTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class PlanNodeSerdeTest : public testing::Test,
public velox::test::VectorTestBase {
protected:
static void SetUpTestCase() {
memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
}

PlanNodeSerdeTest() {
Expand Down
4 changes: 2 additions & 2 deletions presto-native-execution/presto_cpp/main/tests/PeriodicMemoryCheckerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ TEST_F(PeriodicMemoryCheckerTest, heapdump) {
}

TEST_F(PeriodicMemoryCheckerTest, pushbackMemory) {
memory::MemoryManagerOptions options;
memory::MemoryManager::Options options;
options.allocatorCapacity = 32L << 20;
memory::MemoryManager::testingSetInstance(options);
auto asyncDataCache =
Expand Down Expand Up @@ -222,6 +222,6 @@ TEST_F(PeriodicMemoryCheckerTest, pushbackMemory) {
// Shutdown global memory setups
asyncDataCache->shutdown();
cache::AsyncDataCache::setInstance(nullptr);
memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
}
} // namespace facebook::presto
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/main/tests/PrestoExchangeSourceTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ struct Params {
class PrestoExchangeSourceTest : public ::testing::TestWithParam<Params> {
public:
static void SetUpTestCase() {
MemoryManagerOptions options;
MemoryManager::Options options;
options.allocatorCapacity = 1L << 30;
options.useMmapAllocator = true;
MemoryManager::testingSetInstance(options);
Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/main/tests/QueryContextCacheTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void verifyQueryCtxCache(
class QueryContextCacheTest : public testing::Test {
protected:
static void SetUpTestCase() {
memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
}

void SetUp() override {
Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/main/tests/QueryContextManagerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace facebook::presto {
class QueryContextManagerTest : public testing::Test {
protected:
static void SetUpTestCase() {
velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManagerOptions{});
velox::memory::MemoryManager::testingSetInstance(velox::memory::MemoryManager::Options{});
}

void SetUp() override {
Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/main/types/tests/PlanConverterTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ std::shared_ptr<const core::PlanNode> assertToBatchVeloxQueryPlan(
class PlanConverterTest : public ::testing::Test {
protected:
static void SetUpTestCase() {
memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
}

void SetUp() override {
Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/main/types/tests/RowExpressionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ using namespace facebook::velox::core;
class RowExpressionTest : public ::testing::Test {
public:
static void SetUpTestCase() {
memory::MemoryManager::testingSetInstance(memory::MemoryManagerOptions{});
memory::MemoryManager::testingSetInstance(memory::MemoryManager::Options{});
}

void SetUp() override {
Expand Down
Loading