Compare commits
2 Commits
5786d7f4b6
...
435a208c93
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
435a208c93 | ||
|
|
cc11d3e5a0 |
@@ -54,9 +54,9 @@ fn resolve_mode<'a>(args: &'a WhoArgs) -> Result<WhoMode<'a>> {
|
||||
// Disambiguation: if target contains '/', it's a file path.
|
||||
// GitLab usernames never contain '/'.
|
||||
// Root files (no '/') require --path.
|
||||
if target.contains('/') {
|
||||
if clean.contains('/') {
|
||||
return Ok(WhoMode::Expert {
|
||||
path: normalize_repo_path(target),
|
||||
path: normalize_repo_path(clean),
|
||||
});
|
||||
}
|
||||
return Ok(WhoMode::Workload { username: clean });
|
||||
|
||||
@@ -140,6 +140,7 @@ pub fn run_migrations(conn: &Connection) -> Result<()> {
|
||||
}
|
||||
Err(e) => {
|
||||
let _ = conn.execute_batch(&format!("ROLLBACK TO {}", savepoint_name));
|
||||
let _ = conn.execute_batch(&format!("RELEASE {}", savepoint_name));
|
||||
return Err(LoreError::MigrationFailed {
|
||||
version,
|
||||
message: e.to_string(),
|
||||
@@ -216,6 +217,7 @@ pub fn run_migrations_from_dir(conn: &Connection, migrations_dir: &Path) -> Resu
|
||||
}
|
||||
Err(e) => {
|
||||
let _ = conn.execute_batch(&format!("ROLLBACK TO {}", savepoint_name));
|
||||
let _ = conn.execute_batch(&format!("RELEASE {}", savepoint_name));
|
||||
return Err(LoreError::MigrationFailed {
|
||||
version,
|
||||
message: e.to_string(),
|
||||
|
||||
@@ -135,6 +135,13 @@ impl AppLock {
|
||||
}
|
||||
|
||||
fn start_heartbeat(&mut self) {
|
||||
// Stop any existing heartbeat thread before starting a new one
|
||||
if let Some(handle) = self.heartbeat_handle.take() {
|
||||
self.released.store(true, Ordering::SeqCst);
|
||||
let _ = handle.join();
|
||||
self.released.store(false, Ordering::SeqCst);
|
||||
}
|
||||
|
||||
let name = self.name.clone();
|
||||
let owner = self.owner.clone();
|
||||
let interval = Duration::from_millis(self.heartbeat_interval_ms);
|
||||
|
||||
@@ -146,16 +146,15 @@ fn collect_state_events(
|
||||
continue;
|
||||
}
|
||||
|
||||
let summary = format!("State changed to {state}");
|
||||
events.push(TimelineEvent {
|
||||
timestamp: created_at,
|
||||
entity_type: entity.entity_type.clone(),
|
||||
entity_id: entity.entity_id,
|
||||
entity_iid: entity.entity_iid,
|
||||
project_path: entity.project_path.clone(),
|
||||
event_type: TimelineEventType::StateChanged {
|
||||
state: state.clone(),
|
||||
},
|
||||
summary: format!("State changed to {state}"),
|
||||
event_type: TimelineEventType::StateChanged { state },
|
||||
summary,
|
||||
actor,
|
||||
url: None,
|
||||
is_seed,
|
||||
@@ -195,18 +194,14 @@ fn collect_label_events(
|
||||
let label = label_name.unwrap_or_else(|| "[deleted label]".to_owned());
|
||||
|
||||
let (event_type, summary) = match action.as_str() {
|
||||
"add" => (
|
||||
TimelineEventType::LabelAdded {
|
||||
label: label.clone(),
|
||||
},
|
||||
format!("Label added: {label}"),
|
||||
),
|
||||
"remove" => (
|
||||
TimelineEventType::LabelRemoved {
|
||||
label: label.clone(),
|
||||
},
|
||||
format!("Label removed: {label}"),
|
||||
),
|
||||
"add" => {
|
||||
let summary = format!("Label added: {label}");
|
||||
(TimelineEventType::LabelAdded { label }, summary)
|
||||
}
|
||||
"remove" => {
|
||||
let summary = format!("Label removed: {label}");
|
||||
(TimelineEventType::LabelRemoved { label }, summary)
|
||||
}
|
||||
_ => continue,
|
||||
};
|
||||
|
||||
@@ -257,18 +252,14 @@ fn collect_milestone_events(
|
||||
let milestone = milestone_title.unwrap_or_else(|| "[deleted milestone]".to_owned());
|
||||
|
||||
let (event_type, summary) = match action.as_str() {
|
||||
"add" => (
|
||||
TimelineEventType::MilestoneSet {
|
||||
milestone: milestone.clone(),
|
||||
},
|
||||
format!("Milestone set: {milestone}"),
|
||||
),
|
||||
"remove" => (
|
||||
TimelineEventType::MilestoneRemoved {
|
||||
milestone: milestone.clone(),
|
||||
},
|
||||
format!("Milestone removed: {milestone}"),
|
||||
),
|
||||
"add" => {
|
||||
let summary = format!("Milestone set: {milestone}");
|
||||
(TimelineEventType::MilestoneSet { milestone }, summary)
|
||||
}
|
||||
"remove" => {
|
||||
let summary = format!("Milestone removed: {milestone}");
|
||||
(TimelineEventType::MilestoneRemoved { milestone }, summary)
|
||||
}
|
||||
_ => continue,
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
pub const CHUNK_ROWID_MULTIPLIER: i64 = 1000;
|
||||
|
||||
pub fn encode_rowid(document_id: i64, chunk_index: i64) -> i64 {
|
||||
assert!(
|
||||
(0..CHUNK_ROWID_MULTIPLIER).contains(&chunk_index),
|
||||
"chunk_index {chunk_index} out of range [0, {CHUNK_ROWID_MULTIPLIER})"
|
||||
);
|
||||
document_id
|
||||
.checked_mul(CHUNK_ROWID_MULTIPLIER)
|
||||
.and_then(|v| v.checked_add(chunk_index))
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use std::collections::{HashMap, HashSet};
|
||||
use std::sync::Arc;
|
||||
|
||||
use futures::future::join_all;
|
||||
use rusqlite::Connection;
|
||||
@@ -28,7 +29,7 @@ struct ChunkWork {
|
||||
doc_id: i64,
|
||||
chunk_index: usize,
|
||||
total_chunks: usize,
|
||||
doc_hash: String,
|
||||
doc_hash: Arc<str>,
|
||||
chunk_hash: String,
|
||||
text: String,
|
||||
}
|
||||
@@ -212,12 +213,13 @@ async fn embed_page(
|
||||
|
||||
chunks_needed.insert(doc.document_id, total_chunks);
|
||||
|
||||
let doc_hash: Arc<str> = Arc::from(doc.content_hash.as_str());
|
||||
for (chunk_index, text) in chunks {
|
||||
all_chunks.push(ChunkWork {
|
||||
doc_id: doc.document_id,
|
||||
chunk_index,
|
||||
total_chunks,
|
||||
doc_hash: doc.content_hash.clone(),
|
||||
doc_hash: Arc::clone(&doc_hash),
|
||||
chunk_hash: sha256_hash(&text),
|
||||
text,
|
||||
});
|
||||
@@ -501,7 +503,6 @@ fn store_embedding(
|
||||
let rowid = encode_rowid(doc_id, chunk_index as i64);
|
||||
|
||||
embed_buf.clear();
|
||||
embed_buf.reserve(embedding.len() * 4);
|
||||
for f in embedding {
|
||||
embed_buf.extend_from_slice(&f.to_le_bytes());
|
||||
}
|
||||
|
||||
@@ -1217,7 +1217,12 @@ async fn handle_auth_test(
|
||||
eprintln!(
|
||||
"{}",
|
||||
serde_json::to_string(&output).unwrap_or_else(|_| {
|
||||
format!(r#"{{"error":{{"code":"{}","message":"{}"}}}}"#, e.code(), e)
|
||||
let msg = e.to_string().replace('\\', "\\\\").replace('"', "\\\"");
|
||||
format!(
|
||||
r#"{{"error":{{"code":"{}","message":"{}"}}}}"#,
|
||||
e.code(),
|
||||
msg
|
||||
)
|
||||
})
|
||||
);
|
||||
} else {
|
||||
|
||||
@@ -15,7 +15,8 @@ pub fn rank_rrf(vector_results: &[(i64, f64)], fts_results: &[(i64, f64)]) -> Ve
|
||||
return Vec::new();
|
||||
}
|
||||
|
||||
let mut scores: HashMap<i64, (f64, Option<usize>, Option<usize>)> = HashMap::new();
|
||||
let mut scores: HashMap<i64, (f64, Option<usize>, Option<usize>)> =
|
||||
HashMap::with_capacity(vector_results.len() + fts_results.len());
|
||||
|
||||
for (i, &(doc_id, _)) in vector_results.iter().enumerate() {
|
||||
let rank = i + 1;
|
||||
|
||||
Reference in New Issue
Block a user