From d33aa738d5cae94c626cae1ce9c510e3eaf79e1e Mon Sep 17 00:00:00 2001 From: Sam Hughes Date: Sat, 16 Nov 2024 17:30:59 -0800 Subject: [PATCH 1/2] chore(cubestore): Remove dependency on feature(cursor_remaining) in cubehll This got removed in more recent versions of Rust. --- rust/cubestore/cubehll/src/instance.rs | 2 +- rust/cubestore/cubehll/src/lib.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/rust/cubestore/cubehll/src/instance.rs b/rust/cubestore/cubehll/src/instance.rs index 9302f9505b943..d561cb1f0fa68 100644 --- a/rust/cubestore/cubehll/src/instance.rs +++ b/rust/cubestore/cubehll/src/instance.rs @@ -201,7 +201,7 @@ impl HllInstance { let mut values = Vec::with_capacity(num_hashes); let mut data = Cursor::new(data); let maxval = (1 << reg_width) as u32 - 1; - while !data.is_empty() { + while data.position() < data.get_ref().len() as u64 { let hash = data.read_u64::().unwrap(); let ind = hash & mask; let val = hash >> log_num_buckets; diff --git a/rust/cubestore/cubehll/src/lib.rs b/rust/cubestore/cubehll/src/lib.rs index 90eb84b584f69..69424aa1a3069 100644 --- a/rust/cubestore/cubehll/src/lib.rs +++ b/rust/cubestore/cubehll/src/lib.rs @@ -1,4 +1,3 @@ -#![feature(cursor_remaining)] /* * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 44701dd85fafe416486e92ab230b74af1b795461 Mon Sep 17 00:00:00 2001 From: Sam Hughes Date: Sat, 16 Nov 2024 18:23:13 -0800 Subject: [PATCH 2/2] chore(cubestore): Typo in README --- rust/cubestore/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/cubestore/README.md b/rust/cubestore/README.md index 42e595aca73e6..0aa4eaf38a470 100644 --- a/rust/cubestore/README.md +++ b/rust/cubestore/README.md @@ -153,7 +153,7 @@ exclude this from your PR!) ``` [patch.'https://github.com/cube-js/arrow-rs'] -arquet = { path = "../../../arrow-rs/parquet" } +parquet = { path = "../../../arrow-rs/parquet" } arrow = { path = "../../../arrow-rs/arrow" } [patch.'https://github.com/cube-js/arrow-datafusion']