clean up and use nonzerou64

Signed-off-by: Connor Tsui <[email protected]>

Author: connortsui20

vortex-wasm/src/bin/test_s3_read.rs

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
+use std::num::NonZeroU64;
+
 use serde::Serialize;
 use vortex::utils::aliases::hash_map::HashMap;
 use vortex_error::VortexResult;
@@ -29,13 +31,11 @@ pub struct BenchmarkGroupData {
     pub charts: HashMap<String, ChartData>,
 }
 
-// TODO(connor): We should be able to use an `Option<NonZeroU64>` since our benchmarks should
-// basically never hit 0, but that is an optimization for another day.
 /// Chart data.
 #[derive(Debug, Clone, Serialize)]
 pub struct ChartData {
     /// The name of a series and its associated data.
-    pub aligned_series: HashMap<String, Vec<Option<u64>>>,
+    pub aligned_series: HashMap<String, Vec<Option<NonZeroU64>>>,
 }
 
 // ============================================================================
@@ -145,10 +145,19 @@ pub fn process_benchmarks(
 fn create_aligned_series_data(
     commits_and_values: CommitValueMap<'_>,
     sorted_commits: &[CommitInfo],
-) -> Vec<Option<u64>> {
+) -> Vec<Option<NonZeroU64>> {
     sorted_commits
         .iter()
-        .map(|commit_info| commits_and_values.get(commit_info.commit_id()).copied())
+        .map(|commit_info| {
+            commits_and_values
+                .get(commit_info.commit_id())
+                .map(|&value| {
+                    NonZeroU64::new(value).unwrap_or_else(|| {
+                        eprintln!("Warning: benchmark value of 0 encountered, converting to 1");
+                        NonZeroU64::MIN
+                    })
+                })
+        })
         .collect()
 }
 

vortex-wasm/src/bin/test_s3_update.rs

@@ -13,10 +13,8 @@ use vortex::file::OpenOptionsSessionExt;
 use vortex::session::VortexSession;
 use vortex_array::ArrayRef;
 use vortex_error::VortexExpect;
-use wasm_bindgen::JsValue;
 
 use super::entry::BenchmarkEntry;
-use crate::website::charts::BenchmarkResponse;
 use crate::website::charts::Benchmarks;
 use crate::website::charts::extract_summary;
 use crate::website::charts::process_benchmarks;
@@ -170,74 +168,3 @@ pub async fn read_s3_array(session: &VortexSession, key: &str) -> VortexResult<A
 
     file.scan()?.into_array_stream()?.read_all().await
 }
-
-/// Reads benchmark entries from an S3 object containing a Vortex file.
-///
-/// This function downloads the Vortex file from S3 using HTTP (the bucket is public), parses the
-/// columnar struct array, and converts it to a vector of row-wise [`BenchmarkEntry`] structs.
-///
-/// # Arguments
-///
-/// * `session` - The Vortex session for reading files.
-/// * `key` - The S3 object key (e.g., "test/random_access.vortex").
-///
-/// # Errors
-///
-/// Returns an error if:
-/// - The HTTP request fails.
-/// - The file is not a valid Vortex file.
-/// - The schema does not match the expected [`BenchmarkEntry`] schema.
-pub async fn read_benchmark_entries(
-    session: &VortexSession,
-    key: &str,
-) -> VortexResult<Vec<BenchmarkEntry>> {
-    let array = read_s3_array(session, key).await?;
-    BenchmarkEntry::vec_from_array(&array)
-}
-
-/// Fetches benchmark data and commit metadata from S3 and returns them as a JavaScript object.
-///
-/// The returned object has the structure:
-/// ```javascript
-/// {
-///   benchmarks: { [group_name]: { charts: { [chart_name]: { aligned_series: { [series_name]: [...] } } } } },
-///   commits: [{ timestamp, author: { name, email }, message, commit_id }, ...]
-/// }
-/// ```
-///
-/// # Arguments
-///
-/// * `session` - The Vortex session for reading files.
-/// * `commits_key` - S3 key for the commits Vortex file.
-/// * `data_key` - S3 key for the benchmark data Vortex file.
-///
-/// # Errors
-///
-/// Returns an error if:
-/// - Either S3 fetch fails.
-/// - The files are not valid Vortex files.
-/// - The schemas don't match expected formats.
-/// - Validation fails (empty names, no data points, mismatched lengths).
-pub async fn get_benchmark_data(
-    session: &VortexSession,
-    commits_key: &str,
-    data_key: &str,
-) -> VortexResult<JsValue> {
-    let (data_array, commits_array) = futures::try_join!(
-        read_s3_array(session, data_key),
-        read_s3_array(session, commits_key)
-    )?;
-
-    let data = BenchmarkEntry::vec_from_array(&data_array)?;
-    let mut commits = CommitInfo::vec_from_array(&commits_array)?;
-    commits.sort_unstable();
-
-    let benchmarks = process_benchmarks(&data, &commits)?;
-    let response = BenchmarkResponse {
-        benchmarks,
-        commits,
-    };
-
-    serde_wasm_bindgen::to_value(&response)
-        .map_err(|e| vortex_err!("Failed to serialize benchmark response: {e}"))
-}