Skip to content
Merged
Changes from all commits
Commits
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
21 changes: 14 additions & 7 deletions src/importer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1907,19 +1907,22 @@ impl Importer {
}
}

let events = self.filter_existing(events).await?;
let projected_events = self.summary.events + events.len();
let requires_cursor = event_page_requires_cursor(
count,
limit,
self.next_limit(self.config.max_events, projected_events),
);
let next_cursor = validated_event_page_cursor(requires_cursor, next_cursor)?;

let previous_events = self.summary.events;
let sent = self.send(events).await?;
let sent = self.send_filtered(events).await?;
self.summary.events += sent;
if previous_events / PROGRESS_INTERVAL < self.summary.events / PROGRESS_INTERVAL {
eprintln!("PostHog import progress: events={}", self.summary.events);
}

let requires_cursor = event_page_requires_cursor(
count,
limit,
self.next_limit(self.config.max_events, self.summary.events),
);
let next_cursor = validated_event_page_cursor(requires_cursor, next_cursor)?;
if !requires_cursor {
break;
}
Expand Down Expand Up @@ -2048,6 +2051,10 @@ impl Importer {

async fn send(&mut self, items: Vec<ImportBatchItem>) -> Result<usize, ImportError> {
let items = self.filter_existing(items).await?;
self.send_filtered(items).await
}

async fn send_filtered(&mut self, items: Vec<ImportBatchItem>) -> Result<usize, ImportError> {
if items.is_empty() {
return Ok(0);
}
Expand Down
Loading