openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-15 12:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

nit fix 2

Browse Source
This commit is contained in:
jif-oai
2026-02-10 19:31:30 +00:00
parent 3a419ba624
commit f6ed46dce6
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
codex-rs/state/src/runtime/memory.rs
View File

@@ -123,7 +123,7 @@ WHERE thread_id = ?
let rows = match scope_kind {
MEMORY_SCOPE_KIND_CWD => {
let mut rows = sqlx::query(
let exact_rows = sqlx::query(
r#"
SELECT so.thread_id, so.source_updated_at, so.raw_memory, so.summary, so.generated_at
FROM stage1_outputs AS so
@@ -138,13 +138,9 @@ LIMIT ?
.fetch_all(self.pool.as_ref())
.await?;
if rows.len() < n
&& let Some(normalized_scope_key) = normalize_cwd_for_scope_matching(scope_key)
{
let mut selected_thread_ids = rows
.iter()
.map(|row| row.try_get::<String, _>("thread_id"))
.collect::<Result<HashSet<_>, _>>()?;
if let Some(normalized_scope_key) = normalize_cwd_for_scope_matching(scope_key) {
let mut rows = Vec::new();
let mut selected_thread_ids = HashSet::new();
let candidate_rows = sqlx::query(
r#"
SELECT so.thread_id, so.source_updated_at, so.raw_memory, so.summary, so.generated_at, t.cwd AS thread_cwd
@@ -173,9 +169,10 @@ ORDER BY so.source_updated_at DESC, so.thread_id DESC
rows.push(row);
}
}
if rows.is_empty() { exact_rows } else { rows }
} else {
exact_rows
}
rows
}
MEMORY_SCOPE_KIND_USER => {
sqlx::query(