Skip to content

Commit

Permalink
fix(webserver): fix repositories created from Github / Gitlab provide…
Browse files Browse the repository at this point in the history
…rs being wrongly garbage collected
  • Loading branch information
wsxiaoys committed Aug 22, 2024
1 parent f9df141 commit 14235a6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
4 changes: 0 additions & 4 deletions ee/tabby-webserver/src/service/background_job/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ impl SchedulerGitJob {
.map(|repo| CodeRepository::new(&repo.git_url, &repo.source_id))
.collect();

let mut code = CodeIndexer::default();

code.garbage_collection(&repositories).await;

for repository in repositories {
let _ = job
.trigger(BackgroundJobEvent::SchedulerGitRepository(repository).to_command())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::sync::Arc;

use tabby_index::public::run_index_garbage_collection;
use tabby_index::public::{run_index_garbage_collection, CodeIndexer};
use tabby_schema::{repository::RepositoryService, web_crawler::WebCrawlerService};

use super::helper::Job;
Expand All @@ -17,12 +17,8 @@ impl IndexGarbageCollection {
repository: Arc<dyn RepositoryService>,
web_crawler: Arc<dyn WebCrawlerService>,
) -> tabby_schema::Result<()> {
let mut sources: Vec<_> = repository
.list_all_code_repository()
.await?
.into_iter()
.map(|repo| repo.source_id)
.collect();
let repositories = repository.list_all_code_repository().await?;
let mut sources: Vec<_> = repositories.iter().map(|repo| repo.source_id.clone()).collect();

Check warning on line 21 in ee/tabby-webserver/src/service/background_job/index_garbage_collection.rs

View check run for this annotation

Codecov / codecov/patch

ee/tabby-webserver/src/service/background_job/index_garbage_collection.rs#L20-L21

Added lines #L20 - L21 were not covered by tests

sources.extend(
web_crawler
Expand All @@ -32,6 +28,13 @@ impl IndexGarbageCollection {
.map(|url| url.source_id()),
);

run_index_garbage_collection(sources).map_err(tabby_schema::CoreError::Other)
// Run garbage collection on the index
run_index_garbage_collection(sources)?;

Check warning on line 32 in ee/tabby-webserver/src/service/background_job/index_garbage_collection.rs

View check run for this annotation

Codecov / codecov/patch

ee/tabby-webserver/src/service/background_job/index_garbage_collection.rs#L31-L32

Added lines #L31 - L32 were not covered by tests

// Run garbage collection on the code repositories (cloned directories)
let mut code = CodeIndexer::default();
code.garbage_collection(&repositories).await;

Check warning on line 36 in ee/tabby-webserver/src/service/background_job/index_garbage_collection.rs

View check run for this annotation

Codecov / codecov/patch

ee/tabby-webserver/src/service/background_job/index_garbage_collection.rs#L35-L36

Added lines #L35 - L36 were not covered by tests

Ok(())

Check warning on line 38 in ee/tabby-webserver/src/service/background_job/index_garbage_collection.rs

View check run for this annotation

Codecov / codecov/patch

ee/tabby-webserver/src/service/background_job/index_garbage_collection.rs#L38

Added line #L38 was not covered by tests
}
}

0 comments on commit 14235a6

Please sign in to comment.