This is an automated email from the ASF dual-hosted git repository.
zhangzc pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new a17f5446d [CH] Fix memory config spill_mem_ratio always zero (#6743)
a17f5446d is described below
commit a17f5446dee116058863754875b11764dc316d28
Author: LiuNeng <[email protected]>
AuthorDate: Wed Aug 7 17:49:20 2024 +0800
[CH] Fix memory config spill_mem_ratio always zero (#6743)
[CH] Fix memory config spill_mem_ratio always zero
Co-authored-by: liuneng1994 <[email protected]>
---
cpp-ch/local-engine/Common/GlutenConfig.h | 2 +-
cpp-ch/local-engine/Shuffle/PartitionWriter.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cpp-ch/local-engine/Common/GlutenConfig.h
b/cpp-ch/local-engine/Common/GlutenConfig.h
index 782df7f54..abb7295ad 100644
--- a/cpp-ch/local-engine/Common/GlutenConfig.h
+++ b/cpp-ch/local-engine/Common/GlutenConfig.h
@@ -38,7 +38,7 @@ struct MemoryConfig
MemoryConfig config;
config.extra_memory_hard_limit =
context->getConfigRef().getUInt64(EXTRA_MEMORY_HARD_LIMIT, 0);
config.off_heap_per_task =
context->getConfigRef().getUInt64(CH_TASK_MEMORY, 0);
- config.spill_mem_ratio =
context->getConfigRef().getUInt64(SPILL_MEM_RATIO, 0.9);
+ config.spill_mem_ratio =
context->getConfigRef().getDouble(SPILL_MEM_RATIO, 0.9);
return config;
}
};
diff --git a/cpp-ch/local-engine/Shuffle/PartitionWriter.cpp
b/cpp-ch/local-engine/Shuffle/PartitionWriter.cpp
index a2ef0888a..58be56421 100644
--- a/cpp-ch/local-engine/Shuffle/PartitionWriter.cpp
+++ b/cpp-ch/local-engine/Shuffle/PartitionWriter.cpp
@@ -324,7 +324,7 @@ PartitionWriter::PartitionWriter(CachedShuffleWriter *
shuffle_writer_, LoggerPt
partition_block_buffer[partition_id] =
std::make_shared<ColumnsBuffer>(options->split_size);
partition_buffer[partition_id] = std::make_shared<Partition>();
}
- settings.loadFromContext(SerializedPlanParser::global_context);
+ settings =
MemoryConfig::loadFromContext(SerializedPlanParser::global_context);
}
size_t PartitionWriter::bytes() const
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
