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
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ void PeriodicTaskManager::updateTaskStats() {
}
RECORD_METRIC_VALUE(
kCounterTotalPartitionedOutputBuffer,
velox::exec::OutputBufferManager::getInstance().lock()->numBuffers());
velox::exec::OutputBufferManager::getInstanceRef()->numBuffers());
}

void PeriodicTaskManager::addTaskStatsTask() {
Expand Down
3 changes: 1 addition & 2 deletions presto-native-execution/presto_cpp/main/PrestoServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ protocol::NodeState convertNodeState(presto::NodeState nodeState) {
}

void enableChecksum() {
velox::exec::OutputBufferManager::getInstance().lock()->setListenerFactory(
velox::exec::OutputBufferManager::getInstanceRef()->setListenerFactory(
[]() {
return std::make_unique<
velox::serializer::presto::PrestoOutputStreamListener>();
Expand Down Expand Up @@ -283,7 +283,6 @@ void PrestoServer::run() {
registerPrestoToVeloxConnector(
std::make_unique<SystemPrestoToVeloxConnector>("$system@system"));

velox::exec::OutputBufferManager::initialize({});
initializeVeloxMemory();
initializeThreadPools();

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 @@ -329,7 +329,7 @@ TaskManager::TaskManager(
folly::Executor* driverExecutor,
folly::Executor* httpSrvCpuExecutor,
folly::Executor* spillerExecutor)
: bufferManager_(velox::exec::OutputBufferManager::getInstance().lock()),
: bufferManager_(velox::exec::OutputBufferManager::getInstanceRef()),
queryContextManager_(std::make_unique<QueryContextManager>(
driverExecutor,
spillerExecutor)),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1441,7 +1441,7 @@ TEST_P(TaskManagerTest, testCumulativeMemory) {
veloxTask->start(1);
prestoTask->taskStarted = true;

auto outputBufferManager = OutputBufferManager::getInstance().lock();
auto outputBufferManager = OutputBufferManager::getInstanceRef();
ASSERT_TRUE(outputBufferManager != nullptr);
// Wait until the task has produced all the output buffers so its memory usage
// stay constant to ease test.
Expand Down
2 changes: 1 addition & 1 deletion presto-native-execution/velox
Submodule velox updated 61 files
+27 −2 .github/workflows/scheduled.yml
+12 −14 CMake/FindArrow.cmake
+17 −5 velox/buffer/Buffer.h
+45 −0 velox/buffer/tests/BufferTest.cpp
+4 −0 velox/common/base/tests/GTestUtils.h
+0 −11 velox/common/memory/SharedArbitrator.cpp
+0 −7 velox/common/memory/SharedArbitrator.h
+26 −0 velox/docs/functions/presto/datetime.rst
+10 −0 velox/docs/functions/presto/ipaddress.rst
+10 −0 velox/docs/functions/spark/misc.rst
+9 −7 velox/dwio/common/BufferUtil.h
+2 −15 velox/dwio/common/SelectiveRepeatedColumnReader.cpp
+15 −0 velox/dwio/common/SelectiveRepeatedColumnReader.h
+9 −11 velox/exec/OutputBufferManager.cpp
+15 −5 velox/exec/OutputBufferManager.h
+1 −1 velox/exec/PartitionedOutput.cpp
+1 −1 velox/exec/Task.cpp
+30 −0 velox/exec/TraceUtil.cpp
+8 −0 velox/exec/TraceUtil.h
+1 −1 velox/exec/tests/ExchangeClientTest.cpp
+3 −3 velox/exec/tests/GroupedExecutionTest.cpp
+1 −1 velox/exec/tests/LimitTest.cpp
+2 −2 velox/exec/tests/MultiFragmentTest.cpp
+38 −0 velox/exec/tests/OperatorTraceTest.cpp
+1 −1 velox/exec/tests/OutputBufferManagerTest.cpp
+1 −1 velox/exec/tests/PartitionedOutputTest.cpp
+1 −1 velox/exec/tests/TaskTest.cpp
+19 −0 velox/exec/tests/utils/HiveConnectorTestBase.cpp
+12 −0 velox/exec/tests/utils/HiveConnectorTestBase.h
+3 −3 velox/exec/tests/utils/LocalExchangeSource.cpp
+48 −18 velox/expression/tests/CastExprTest.cpp
+93 −1 velox/external/tzdb/time_zone.cpp
+45 −1 velox/functions/prestosql/DateTimeFunctions.h
+32 −1 velox/functions/prestosql/DateTimeImpl.h
+234 −0 velox/functions/prestosql/IPAddressFunctions.h
+1 −1 velox/functions/prestosql/fuzzer/AggregationFuzzerTest.cpp
+3 −2 velox/functions/prestosql/fuzzer/ApproxDistinctResultVerifier.h
+2 −0 velox/functions/prestosql/fuzzer/WindowFuzzerTest.cpp
+153 −0 velox/functions/prestosql/json/JsonStringUtil.cpp
+11 −0 velox/functions/prestosql/json/JsonStringUtil.h
+3 −0 velox/functions/prestosql/registration/DateTimeFunctionsRegistration.cpp
+77 −0 velox/functions/prestosql/tests/DateTimeFunctionsTest.cpp
+257 −0 velox/functions/prestosql/tests/IPAddressFunctionsTest.cpp
+73 −0 velox/functions/prestosql/tests/JsonCastTest.cpp
+20 −3 velox/functions/prestosql/types/JsonCastOperator.cpp
+3 −0 velox/functions/sparksql/registration/RegisterSpecialForm.cpp
+1 −0 velox/functions/sparksql/specialforms/CMakeLists.txt
+110 −0 velox/functions/sparksql/specialforms/GetStructField.cpp
+43 −0 velox/functions/sparksql/specialforms/GetStructField.h
+1 −0 velox/functions/sparksql/tests/CMakeLists.txt
+118 −0 velox/functions/sparksql/tests/GetStructFieldTest.cpp
+1 −1 velox/tool/trace/PartitionedOutputReplayer.h
+15 −7 velox/tool/trace/TraceReplayRunner.cpp
+1 −1 velox/tool/trace/tests/PartitionedOutputReplayerTest.cpp
+6 −0 velox/tool/trace/tests/TableScanReplayerTest.cpp
+4 −4 velox/tpch/gen/dbgen/bm_utils.cpp
+36 −0 velox/type/TypeUtil.cpp
+28 −0 velox/type/TypeUtil.h
+2 −3 velox/type/parser/ParserUtil.cpp
+5 −5 velox/type/parser/tests/TypeParserTest.cpp
+39 −0 velox/type/tests/TypeUtilTest.cpp
Loading