refactor(cache): redesign cache system with structured keys and improved performance
- Add repo_path parameter to cached_response and cached_vec_response functions - Implement structured cache key format with namespace, repo_path, and request proto - Replace global cache with Moka in-memory cache using weight-based eviction - Set 256MB memory cap with 10-minute TTL and 2-minute TTI policy - Add metrics collection for cache operations and evictions - Implement efficient repo-scoped invalidation using key structure - Add detailed documentation comments explaining cache architecture - Remove outdated dependencies and update dependency versions - Add error handling for encoding failures in cache operations - Optimize Vec responses with length-delimited encoding and pre-allocation
This commit is contained in:
+14
-7
@@ -19,16 +19,17 @@ impl GitBare {
|
||||
"-r".to_string(),
|
||||
];
|
||||
|
||||
if !request.paths.is_empty() {
|
||||
args.push("--".to_string());
|
||||
for p in &request.paths {
|
||||
args.push(p.clone());
|
||||
}
|
||||
}
|
||||
|
||||
args.push(request.base.clone());
|
||||
args.push(request.head.clone());
|
||||
|
||||
if !request.paths.is_empty() {
|
||||
args.push("--".to_string());
|
||||
for path in &request.paths {
|
||||
crate::sanitize::validate_file_path(path)?;
|
||||
args.push(path.clone());
|
||||
}
|
||||
}
|
||||
|
||||
let output = std::process::Command::new("git")
|
||||
.args(&args)
|
||||
.stdout(std::process::Stdio::piped())
|
||||
@@ -38,6 +39,12 @@ impl GitBare {
|
||||
status_code: None,
|
||||
stderr: e.to_string(),
|
||||
})?;
|
||||
if !output.status.success() {
|
||||
return Err(crate::error::GitError::CommandFailed {
|
||||
status_code: output.status.code(),
|
||||
stderr: String::from_utf8_lossy(&output.stderr).trim().to_string(),
|
||||
});
|
||||
}
|
||||
|
||||
let stdout = String::from_utf8_lossy(&output.stdout);
|
||||
let mut paths = Vec::new();
|
||||
|
||||
+25
-2
@@ -22,10 +22,15 @@ struct RawDiffEntry {
|
||||
/// Type alias for diff raw output: (entries, numstat_map)
|
||||
type DiffRawOutput = (Vec<RawDiffEntry>, HashMap<String, (u32, u32, bool)>);
|
||||
|
||||
const MAX_DIFF_COMMAND_OUTPUT_BYTES: usize = 64 * 1024 * 1024;
|
||||
|
||||
impl GitBare {
|
||||
pub fn get_diff(&self, request: GetDiffRequest) -> GitResult<GetDiffResponse> {
|
||||
let base = match request.base.and_then(|s| s.selector) {
|
||||
Some(crate::pb::object_selector::Selector::Oid(oid)) => oid.hex.clone(),
|
||||
Some(crate::pb::object_selector::Selector::Oid(oid)) => {
|
||||
crate::sanitize::validate_oid_hex(&oid.hex)?;
|
||||
oid.hex.clone()
|
||||
}
|
||||
Some(crate::pb::object_selector::Selector::Revision(name)) => {
|
||||
crate::sanitize::validate_revision(&name.revision)?;
|
||||
name.revision.clone()
|
||||
@@ -33,7 +38,10 @@ impl GitBare {
|
||||
None => "HEAD".into(),
|
||||
};
|
||||
let head = match request.head.and_then(|s| s.selector) {
|
||||
Some(crate::pb::object_selector::Selector::Oid(oid)) => oid.hex.clone(),
|
||||
Some(crate::pb::object_selector::Selector::Oid(oid)) => {
|
||||
crate::sanitize::validate_oid_hex(&oid.hex)?;
|
||||
oid.hex.clone()
|
||||
}
|
||||
Some(crate::pb::object_selector::Selector::Revision(name)) => {
|
||||
crate::sanitize::validate_revision(&name.revision)?;
|
||||
name.revision.clone()
|
||||
@@ -48,6 +56,11 @@ impl GitBare {
|
||||
);
|
||||
|
||||
let options = request.options.as_ref();
|
||||
if let Some(options) = options {
|
||||
for path in &options.pathspec {
|
||||
crate::sanitize::validate_file_path(path)?;
|
||||
}
|
||||
}
|
||||
let want_patch = options.is_some_and(|o| o.include_patch);
|
||||
|
||||
let (raw_entries, numstat_map) = self.diff_raw_and_numstat(&base, &head, options)?;
|
||||
@@ -177,6 +190,11 @@ impl GitBare {
|
||||
stderr: String::from_utf8_lossy(&result.stderr).into_owned(),
|
||||
});
|
||||
}
|
||||
if result.stdout.len() > MAX_DIFF_COMMAND_OUTPUT_BYTES {
|
||||
return Err(GitError::InvalidArgument(format!(
|
||||
"diff metadata output too large (max {MAX_DIFF_COMMAND_OUTPUT_BYTES} bytes)"
|
||||
)));
|
||||
}
|
||||
|
||||
// Split by NUL — each record is NUL-terminated
|
||||
let records: Vec<&[u8]> = result.stdout.split(|b| *b == 0).collect();
|
||||
@@ -343,6 +361,11 @@ impl GitBare {
|
||||
stderr: String::from_utf8_lossy(&result.stderr).into_owned(),
|
||||
});
|
||||
}
|
||||
if result.stdout.len() > MAX_DIFF_COMMAND_OUTPUT_BYTES {
|
||||
return Err(GitError::InvalidArgument(format!(
|
||||
"diff patch output too large (max {MAX_DIFF_COMMAND_OUTPUT_BYTES} bytes)"
|
||||
)));
|
||||
}
|
||||
|
||||
// Split combined patch output by "diff --git" headers
|
||||
let mut map = HashMap::new();
|
||||
|
||||
@@ -17,6 +17,12 @@ pub(crate) fn diff_stats_for_range(
|
||||
head: &str,
|
||||
options: Option<&crate::pb::DiffOptions>,
|
||||
) -> GitResult<crate::pb::DiffStats> {
|
||||
if let Some(options) = options {
|
||||
for path in &options.pathspec {
|
||||
crate::sanitize::validate_file_path(path)?;
|
||||
}
|
||||
}
|
||||
|
||||
let mut args = vec![
|
||||
"--git-dir".to_string(),
|
||||
repo.bare_dir.to_string_lossy().into_owned(),
|
||||
|
||||
@@ -3,6 +3,8 @@ use crate::error::{GitError, GitResult};
|
||||
use crate::pb::{GetPatchRequest, GetPatchResponse};
|
||||
use crate::resolve_revision;
|
||||
|
||||
const MAX_PATCH_BYTES: usize = 64 * 1024 * 1024;
|
||||
|
||||
impl GitBare {
|
||||
pub fn get_patch(&self, request: GetPatchRequest) -> GitResult<Vec<GetPatchResponse>> {
|
||||
let base = resolve_revision!(request.base);
|
||||
@@ -28,6 +30,11 @@ impl GitBare {
|
||||
stderr: String::from_utf8_lossy(&result.stderr).into_owned(),
|
||||
});
|
||||
}
|
||||
if result.stdout.len() > MAX_PATCH_BYTES {
|
||||
return Err(GitError::InvalidArgument(format!(
|
||||
"patch output too large (max {MAX_PATCH_BYTES} bytes)"
|
||||
)));
|
||||
}
|
||||
Ok(vec![GetPatchResponse {
|
||||
data: result.stdout,
|
||||
}])
|
||||
|
||||
+34
-3
@@ -2,6 +2,8 @@ use crate::bare::GitBare;
|
||||
use crate::error::GitResult;
|
||||
use crate::pb::*;
|
||||
|
||||
const MAX_RAW_DIFF_OUTPUT_BYTES: usize = 64 * 1024 * 1024;
|
||||
|
||||
impl GitBare {
|
||||
/// Stream raw diff output.
|
||||
pub fn raw_diff(&self, request: RawDiffRequest) -> GitResult<Vec<RawDiffResponse>> {
|
||||
@@ -16,6 +18,7 @@ impl GitBare {
|
||||
"diff".to_string(),
|
||||
];
|
||||
|
||||
let mut pathspecs = Vec::new();
|
||||
// Apply options if present
|
||||
if let Some(ref opts) = request.options {
|
||||
if opts.recursive {
|
||||
@@ -26,14 +29,18 @@ impl GitBare {
|
||||
} else {
|
||||
args.push("--no-binary".to_string());
|
||||
}
|
||||
for ps in &opts.pathspec {
|
||||
args.push("--".to_string());
|
||||
args.push(ps.clone());
|
||||
for pathspec in &opts.pathspec {
|
||||
crate::sanitize::validate_file_path(pathspec)?;
|
||||
pathspecs.push(pathspec.clone());
|
||||
}
|
||||
}
|
||||
|
||||
args.push(base.clone());
|
||||
args.push(head.clone());
|
||||
if !pathspecs.is_empty() {
|
||||
args.push("--".to_string());
|
||||
args.extend(pathspecs);
|
||||
}
|
||||
|
||||
let output = std::process::Command::new("git")
|
||||
.args(&args)
|
||||
@@ -44,6 +51,18 @@ impl GitBare {
|
||||
status_code: None,
|
||||
stderr: e.to_string(),
|
||||
})?;
|
||||
if !output.status.success() {
|
||||
return Err(crate::error::GitError::CommandFailed {
|
||||
status_code: output.status.code(),
|
||||
stderr: String::from_utf8_lossy(&output.stderr).trim().to_string(),
|
||||
});
|
||||
}
|
||||
|
||||
if output.stdout.len() > MAX_RAW_DIFF_OUTPUT_BYTES {
|
||||
return Err(crate::error::GitError::InvalidArgument(format!(
|
||||
"raw diff output too large (max {MAX_RAW_DIFF_OUTPUT_BYTES} bytes)"
|
||||
)));
|
||||
}
|
||||
|
||||
// Chunk the output for streaming
|
||||
const CHUNK_SIZE: usize = 32768;
|
||||
@@ -78,6 +97,18 @@ impl GitBare {
|
||||
status_code: None,
|
||||
stderr: e.to_string(),
|
||||
})?;
|
||||
if !output.status.success() {
|
||||
return Err(crate::error::GitError::CommandFailed {
|
||||
status_code: output.status.code(),
|
||||
stderr: String::from_utf8_lossy(&output.stderr).trim().to_string(),
|
||||
});
|
||||
}
|
||||
|
||||
if output.stdout.len() > MAX_RAW_DIFF_OUTPUT_BYTES {
|
||||
return Err(crate::error::GitError::InvalidArgument(format!(
|
||||
"raw patch output too large (max {MAX_RAW_DIFF_OUTPUT_BYTES} bytes)"
|
||||
)));
|
||||
}
|
||||
|
||||
const CHUNK_SIZE: usize = 32768;
|
||||
let data = output.stdout;
|
||||
|
||||
Reference in New Issue
Block a user