Skip to content

added more logging #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
madhavajay merged 1 commit into from
Feb 4, 2026
Merged

added more logging #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 42 additions & 15 deletions cli/src/commands/long_aggregate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ use rayon::ThreadPoolBuilder;
use crate::long_rows::{LongRow, LongRowReader, LongRowWriter};
use crate::AggregateLongArgs;

fn env_u64(name: &str) -> Option<u64> {
std::env::var(name).ok().and_then(|v| v.parse::<u64>().ok())
}

pub fn run_long_aggregate(args: AggregateLongArgs) -> Result<()> {
let overall_start = Instant::now();
let thread_count = resolve_thread_count(args.threads)?;
Expand Down Expand Up @@ -50,13 +54,15 @@ pub fn run_long_aggregate(args: AggregateLongArgs) -> Result<()> {
chunk_records
);
let chunk_build_start = Instant::now();
let progress_every = env_u64("BVS_AGG_PROGRESS_EVERY").unwrap_or(1_000_000);
let chunk_result = pool.install(|| {
build_sharded_chunks(
&input_files,
&tmp_dir,
thread_count,
chunk_records,
thread_count,
progress_every,
)
})?;
if chunk_result.total_rows == 0 {
Expand Down Expand Up @@ -214,18 +220,26 @@ fn build_sharded_chunks(
shard_count: usize,
chunk_records: usize,
thread_count: usize,
progress_every: u64,
) -> Result<ShardedChunks> {
let shard_count = shard_count.max(1);
let shard_chunks: Mutex<Vec<Vec<PathBuf>>> =
Mutex::new((0..shard_count).map(|_| Vec::new()).collect());
let participants: Mutex<HashSet<String>> = Mutex::new(HashSet::new());
let total_rows = AtomicU64::new(0);
let next_log_at = AtomicU64::new(1_000_000);
let next_log_at = AtomicU64::new(progress_every.max(1));
let start = Instant::now();

input_files
.par_iter()
.enumerate()
.try_for_each(|(file_idx, path)| -> Result<()> {
let file_start = Instant::now();
eprintln!(
"📥 aggregate-long: reading {} ({})",
file_idx + 1,
path.display()
);
let file = File::open(path).with_context(|| format!("Open {:?}", path))?;
let mut reader = LongRowReader::new(file);
let mut buffers: Vec<Vec<LongRow>> = (0..shard_count)
Expand Down Expand Up @@ -280,23 +294,36 @@ fn build_sharded_chunks(
}

let new_total = total_rows.fetch_add(local_rows, AtomicOrdering::Relaxed) + local_rows;
let mut next = next_log_at.load(AtomicOrdering::Relaxed);
while new_total >= next {
if next_log_at
.compare_exchange(
next,
next + 1_000_000,
AtomicOrdering::Relaxed,
AtomicOrdering::Relaxed,
)
.is_ok()
{
eprintln!("🧩 aggregate-long: partitioned {} rows", next);
break;
if progress_every > 0 {
let mut next = next_log_at.load(AtomicOrdering::Relaxed);
while new_total >= next {
if next_log_at
.compare_exchange(
next,
next + progress_every,
AtomicOrdering::Relaxed,
AtomicOrdering::Relaxed,
)
.is_ok()
{
eprintln!(
"?? aggregate-long: partitioned {} rows ({:.1}s elapsed)",
next,
start.elapsed().as_secs_f64()
);
break;
}
next = next_log_at.load(AtomicOrdering::Relaxed);
}
next = next_log_at.load(AtomicOrdering::Relaxed);
}

eprintln!(
"?? aggregate-long: finished {} rows from {} ({:.2}s)",
local_rows,
path.display(),
file_start.elapsed().as_secs_f64()
);

Ok(())
})?;

Expand Down