refactor: upgrade nom to version 8.0.0 and replace the pratt parser with nom_language. Use the first token check to reduce branch traversal in expr_element.

Author: KKould

Cargo.lock

@@ -554,9 +554,9 @@ fast-float2 = "0.2.3"
 gix = "0.71.0"
 indent = "0.1.1"
 logos = "0.12.1"
-nom = "7.1.1"
-nom-rule = "0.4"
-pratt = "0.4.0"
+nom = "8.0.0"
+nom-language = "0.1.0"
+nom-rule = "0.5.1"
 rspack-codespan-reporting = "0.11"
 rustc-demangle = "0.1"
 strsim = "0.10"

Cargo.toml

@@ -19,10 +19,10 @@ indent = { workspace = true }
 itertools = { workspace = true }
 logos = { workspace = true }
 nom = { workspace = true }
+nom-language = { workspace = true }
 nom-rule = { workspace = true }
 ordered-float = { workspace = true }
 percent-encoding = { workspace = true }
-pratt = { workspace = true }
 pretty_assertions = { workspace = true }
 recursive = { workspace = true }
 rspack-codespan-reporting = { workspace = true }

src/query/ast/Cargo.toml

@@ -18,11 +18,11 @@ fn main() {
 
 // bench                     fastest       │ slowest       │ median        │ mean          │ samples │ iters
 // ╰─ dummy                                │               │               │               │         │
-//     ├─ deep_function_call  802.2 µs      │ 1.207 ms      │ 842 µs        │ 850.6 µs      │ 100     │ 100
-//     ├─ deep_query          242.3 µs      │ 426.3 µs      │ 254.2 µs      │ 257.3 µs      │ 100     │ 100
-//     ├─ large_query         1.104 ms      │ 1.264 ms      │ 1.14 ms       │ 1.142 ms      │ 100     │ 100
-//     ├─ large_statement     1.097 ms      │ 1.2 ms        │ 1.15 ms       │ 1.148 ms      │ 100     │ 100
-//     ╰─ wide_expr           282.4 µs      │ 368.6 µs      │ 298 µs        │ 298.7 µs      │ 100     │ 100
+// ├─ deep_function_call  242.8 µs      │ 525.3 µs      │ 258.9 µs      │ 262.8 µs      │ 100     │ 100
+// ├─ deep_query          235.6 µs      │ 364.8 µs      │ 244.8 µs      │ 249.3 µs      │ 100     │ 100
+// ├─ large_query         362.9 µs      │ 451.6 µs      │ 376.5 µs      │ 379.7 µs      │ 100     │ 100
+// ├─ large_statement     364.8 µs      │ 418.4 µs      │ 380.2 µs      │ 382.8 µs      │ 100     │ 100
+// ╰─ wide_expr           96.97 µs      │ 270.2 µs      │ 102.8 µs      │ 105.3 µs      │ 100     │ 100
 
 #[divan::bench_group(max_time = 0.5)]
 mod dummy {

src/query/ast/benches/bench.rs

@@ -20,8 +20,6 @@ use derive_visitor::DriveMut;
 use educe::Educe;
 use enum_as_inner::EnumAsInner;
 use ethnum::i256;
-use pratt::Affix;
-use pratt::Associativity;
 
 use super::ColumnRef;
 use super::OrderByExpr;
@@ -32,6 +30,8 @@ use crate::ast::write_dot_separated_list;
 use crate::ast::Identifier;
 use crate::ast::Indirection;
 use crate::ast::Query;
+use crate::precedence::Affix;
+use crate::precedence::Associativity;
 use crate::span::merge_span;
 use crate::ParseError;
 use crate::Result;

src/query/ast/src/ast/expr.rs

@@ -18,6 +18,7 @@
 pub mod ast;
 pub mod parser;
 mod parser_error;
+pub mod precedence;
 pub mod span;
 mod visitor;
 

src/query/ast/src/lib.rs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use nom::Parser;
 use nom_rule::rule;
 
 use super::expr::literal_string;
@@ -33,7 +34,7 @@ pub fn comment(i: Input) -> IResult<Statement> {
          | #comment_column: "`COMMENT [IF EXISTS] ON COLUMN <table_name>.<column_name> IS '<string_literal>'`"
          | #comment_network_policy: "`COMMENT [IF EXISTS] ON NETWORK POLICY <policy_name> IS '<string_literal>'`"
          | #comment_password_policy: "`COMMENT [IF EXISTS] ON PASSWORD POLICY <policy_name> IS '<string_literal>'`"
-    )(i)
+    ).parse(i)
 }
 
 fn comment_table(i: Input) -> IResult<Statement> {