language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-28 04:45:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Open cache files in parallel (#5120)

Browse source 
## Summary

Open cache files in parallel (again), brings the performance back to be roughly equal to the old implementation.

## Test Plan

Existing tests should keep working.
This commit is contained in:
Thomas de Zeeuw 2023-06-20 17:43:09 +02:00 • committed by GitHub
parent 062b6e5c2b
commit 17f1ecd56e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 353 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/ruff_cli/src/diagnostics.rs
View file

@ -25,7 +25,7 @@ use ruff_python_ast::imports::ImportMap;
use ruff_python_ast::source_code::{LineIndex, SourceCode, SourceFileBuilder};
use ruff_python_stdlib::path::is_project_toml;
use crate::cache::{FileCache, PackageCache};
use crate::cache::{Cache, FileCache};
#[derive(Debug, Default, PartialEq)]
pub(crate) struct Diagnostics {
@ -100,7 +100,7 @@ pub(crate) fn lint_path(
path: &Path,
package: Option<&Path>,
settings: &AllSettings,
package_cache: Option<&PackageCache>,
cache: Option<&Cache>,
noqa: flags::Noqa,
autofix: flags::FixMode,
) -> Result<Diagnostics> {
@ -110,17 +110,17 @@ pub(crate) fn lint_path(
// to cache `fixer::Mode::Apply`, since a file either has no fixes, or we'll
// write the fixes to disk, thus invalidating the cache. But it's a bit hard
// to reason about. We need to come up with a better solution here.)
let caching = match package_cache {
Some(package_cache) if noqa.into() && autofix.is_generate() => {
let relative_path = package_cache
let caching = match cache {
Some(cache) if noqa.into() && autofix.is_generate() => {
let relative_path = cache
.relative_path(path)
.expect("wrong package cache for file");
let last_modified = path.metadata()?.modified()?;
if let Some(cache) = package_cache.get(relative_path, last_modified) {
return Ok(cache.into_diagnostics(path));
if let Some(cache) = cache.get(relative_path, last_modified) {
return Ok(cache.as_diagnostics(path));
}
Some((package_cache, relative_path, last_modified))
Some((cache, relative_path, last_modified))
}
_ => None,
};
@ -207,14 +207,11 @@ pub(crate) fn lint_path(
let imports = imports.unwrap_or_default();
if let Some((package_cache, relative_path, file_last_modified)) = caching {
if parse_error.is_some() {
// We don't cache parsing error, so we remove the old file cache (if
// any).
package_cache.remove(relative_path);
} else {
if let Some((cache, relative_path, file_last_modified)) = caching {
if parse_error.is_none() {
// We don't cache parsing error.
let file_cache = FileCache::new(file_last_modified, &messages, &imports);
package_cache.update(relative_path.to_owned(), file_cache);
cache.update(relative_path.to_owned(), file_cache);
}
}