Merge #87

bors[bot] · MarinPostma · web-flow · commit fafe68d17d0d · 2023-01-23T11:45:53.000Z
87: box parser r=psarna a=MarinPostma

This pr puts the parser on the heap. It's quite chunky, and caused stackoverflows in the past. I'm working to get a nicer patch to upstream lemon-rs, but it requires more work for somilar effects.

I also remove the dependency on my patch


Co-authored-by: ad hoc &lt;postma.marin@protonmail.com&gt;
diff --git a/libsql-server/Cargo.lock b/libsql-server/Cargo.lock
diff --git a/libsql-server/Cargo.toml b/libsql-server/Cargo.toml
@@ -8,6 +8,3 @@ members = [
 [patch."https://github.com/psarna/mvsqlite"]
 mvfs = { git = "https://github.com/MarinPostma/mvsqlite", branch = "use-cchar" }
 mwal = { git = "https://github.com/MarinPostma/mvsqlite", branch = "use-cchar" }
-
-[patch.crates-io]
-sqlite3-parser = { git = "https://github.com/MarinPostma/lemon-rs.git", rev = "d3a6365" }
diff --git a/libsql-server/sqld/src/query_analysis.rs b/libsql-server/sqld/src/query_analysis.rs
@@ -96,7 +96,7 @@ impl Statement {
                 kind,
             })
         }
-        let mut parser = Parser::new(s.as_bytes());
+        let mut parser = Box::new(Parser::new(s.as_bytes()));
         std::iter::from_fn(move || match parser.next() {
             Ok(Some(cmd)) => Some(parse_inner(cmd)),
             Ok(None) => None,

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ impl Statement {`
`96`	`96`	`kind,`
`97`	`97`	`})`
`98`	`98`	`}`
`99`		`- let mut parser = Parser::new(s.as_bytes());`
	`99`	`+ let mut parser = Box::new(Parser::new(s.as_bytes()));`
`100`	`100`	`std::iter::from_fn(move \|\| match parser.next() {`
`101`	`101`	`Ok(Some(cmd)) => Some(parse_inner(cmd)),`
`102`	`102`	`Ok(None) => None,`