From 55715ad998659201b0d9659493a1c3441d243db2 Mon Sep 17 00:00:00 2001
From: ProofOfConcept <poc@bcachefs.org>
Date: Sat, 14 Mar 2026 17:49:27 -0400
Subject: [PATCH] restructure: move search.rs and query.rs into query/
 directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

search.rs → query/engine.rs (algorithms, pipeline, seed matching)
query.rs  → query/parser.rs (PEG query language, field resolution)
query/mod.rs re-exports for backwards compatibility.

crate::search still works (aliased to query::engine).
crate::query::run_query resolves to the parser's entry point.

No logic changes — pure file reorganization.

Co-Authored-By: Kent Overstreet <kent.overstreet@linux.dev>
---
 poc-memory/src/lib.rs                         |  7 +++++--
 poc-memory/src/{search.rs => query/engine.rs} |  0
 poc-memory/src/query/mod.rs                   | 13 +++++++++++++
 poc-memory/src/{query.rs => query/parser.rs}  |  0
 4 files changed, 18 insertions(+), 2 deletions(-)
 rename poc-memory/src/{search.rs => query/engine.rs} (100%)
 create mode 100644 poc-memory/src/query/mod.rs
 rename poc-memory/src/{query.rs => query/parser.rs} (100%)

diff --git a/poc-memory/src/lib.rs b/poc-memory/src/lib.rs
index 60e4cdf..6c35ce0 100644
--- a/poc-memory/src/lib.rs
+++ b/poc-memory/src/lib.rs
@@ -8,11 +8,14 @@ pub mod config;
 pub mod store;
 pub mod util;
 pub mod graph;
-pub mod search;
+pub mod query;
 pub mod similarity;
 pub mod spectral;
 pub mod lookups;
-pub mod query;
+// search was moved into query/engine
+pub use query::engine as search;
+// old query.rs moved into query/parser
+pub use query::parser as query_parser;
 pub mod transcript;
 pub mod neuro;
 pub mod counters;
diff --git a/poc-memory/src/search.rs b/poc-memory/src/query/engine.rs
similarity index 100%
rename from poc-memory/src/search.rs
rename to poc-memory/src/query/engine.rs
diff --git a/poc-memory/src/query/mod.rs b/poc-memory/src/query/mod.rs
new file mode 100644
index 0000000..af296b8
--- /dev/null
+++ b/poc-memory/src/query/mod.rs
@@ -0,0 +1,13 @@
+// query/ — query parsing, search algorithms, and pipeline execution
+//
+// parser.rs  — PEG-based query language (key ~ 'foo' | sort degree | limit 10)
+// engine.rs  — search algorithms: spreading activation, spectral, geodesic,
+//              manifold, confluence. Query DSL execution. Seed matching.
+
+pub mod parser;
+pub mod engine;
+
+// Re-export parser's run_query as the main query entry point
+// (engine::run_query is the internal search pipeline, accessed via crate::search)
+pub use parser::run_query;
+pub use parser::execute_query;
diff --git a/poc-memory/src/query.rs b/poc-memory/src/query/parser.rs
similarity index 100%
rename from poc-memory/src/query.rs
rename to poc-memory/src/query/parser.rs