Skip to content

Bug fix for the analyzer when reusing existing collector. #319

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
merged 1 commit into from
Apr 16, 2025
Merged

Bug fix for the analyzer when reusing existing collector. #319

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
12 changes: 8 additions & 4 deletions src/builder/analyzer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,16 +444,20 @@ impl DataScopeBuilder {
schema: CollectorSchema,
) -> Result<AnalyzedLocalCollectorReference> {
let mut collectors = self.collectors.lock().unwrap();
let collector_idx = collectors.len() as u32;
match collectors.entry(collector_name) {
let existing_len = collectors.len();
let idx = match collectors.entry(collector_name) {
indexmap::map::Entry::Occupied(mut entry) => {
entry.get_mut().merge_schema(&schema)?;
entry.index()
}
indexmap::map::Entry::Vacant(entry) => {
entry.insert(CollectorBuilder::new(Arc::new(schema)));
existing_len
}
}
Ok(AnalyzedLocalCollectorReference { collector_idx })
};
Ok(AnalyzedLocalCollectorReference {
collector_idx: idx as u32,
})
}

pub fn into_data_schema(self) -> Result<DataSchema> {
Expand Down