Skip to content

Commit

Permalink
[native]Advance velox version
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaoxmeng committed Oct 29, 2023
1 parent 7c6bc6e commit 83b20c0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion presto-native-execution/presto_cpp/main/PrestoServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include "velox/connectors/Connector.h"
#include "velox/core/Config.h"
#include "velox/exec/OutputBufferManager.h"
#include "velox/exec/SharedArbitrator.h"
#include "velox/functions/prestosql/aggregates/RegisterAggregateFunctions.h"
#include "velox/functions/prestosql/registration/RegistrationFunctions.h"
#include "velox/functions/prestosql/window/WindowFunctionsRegistration.h"
Expand Down Expand Up @@ -817,7 +818,7 @@ void PrestoServer::registerFileSystems() {
}

void PrestoServer::registerMemoryArbitrators() {
velox::memory::MemoryArbitrator::registerAllFactories();
velox::exec::SharedArbitrator::registerFactory();
}

void PrestoServer::registerStatsCounters() {
Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/presto_cpp/main/TaskManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ std::unique_ptr<TaskInfo> TaskManager::createOrUpdateTask(
LOG(INFO) << "Starting task " << taskId << " with " << maxDrivers
<< " max drivers.";
}
exec::Task::start(execTask, maxDrivers, concurrentLifespans);
execTask->start(maxDrivers, concurrentLifespans);

prestoTask->taskStarted = true;
resultRequests = std::move(prestoTask->resultRequests);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ class UnsafeRowShuffleTest : public exec::test::OperatorTestBase {

auto writerTaskId = makeTaskId("leaf", 0);
auto writerTask = makeTask(writerTaskId, writerPlan, 0);
exec::Task::start(writerTask, numMapDrivers);
writerTask->start(numMapDrivers);

ASSERT_TRUE(exec::test::waitForTaskCompletion(writerTask.get(), 5'000'000));

Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/velox
Submodule velox updated 106 files

0 comments on commit 83b20c0

Please sign in to comment.