This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 6a75ba69d4 Fix compilation of datafusion-cli on 32bit targets (#10594)
6a75ba69d4 is described below
commit 6a75ba69d421af63751c34280a5268ef0e512e91
Author: nathaniel-daniel <[email protected]>
AuthorDate: Tue May 21 12:25:45 2024 -0700
Fix compilation of datafusion-cli on 32bit targets (#10594)
---
datafusion-cli/src/main.rs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/datafusion-cli/src/main.rs b/datafusion-cli/src/main.rs
index 6f71ccafb7..d81a73df20 100644
--- a/datafusion-cli/src/main.rs
+++ b/datafusion-cli/src/main.rs
@@ -304,7 +304,7 @@ enum ByteUnit {
}
impl ByteUnit {
- fn multiplier(&self) -> usize {
+ fn multiplier(&self) -> u64 {
match self {
ByteUnit::Byte => 1,
ByteUnit::KiB => 1 << 10,
@@ -349,8 +349,12 @@ fn extract_memory_pool_size(size: &str) -> Result<usize,
String> {
let unit = byte_suffixes()
.get(suffix)
.ok_or_else(|| format!("Invalid memory pool size '{}'", size))?;
+ let memory_pool_size = usize::try_from(unit.multiplier())
+ .ok()
+ .and_then(|multiplier| num.checked_mul(multiplier))
+ .ok_or_else(|| format!("Memory pool size '{}' is too large",
size))?;
- Ok(num * unit.multiplier())
+ Ok(memory_pool_size)
} else {
Err(format!("Invalid memory pool size '{}'", size))
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
