aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2025-12-30 14:34:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

parse COMMIT|END

Browse Source
This commit is contained in:
TcMits
2025-08-02 14:32:01 +07:00
parent a23500274f
commit 62886ee8a1
2 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/benches/parser_benchmark.rs
View File

@@ -44,7 +44,12 @@ fn bench_lexer(criterion: &mut Criterion) {
}
fn bench_parser(criterion: &mut Criterion) {
let queries = ["BEGIN", "BEGIN EXCLUSIVE TRANSACTION my_trans"];
let queries = [
"BEGIN",
"BEGIN EXCLUSIVE TRANSACTION my_trans",
"COMMIT",
"COMMIT TRANSACTION my_trans",
];
for query in queries.iter() {
let mut group = criterion.benchmark_group(format!("Parser `{query}`"));

85
core/parser/parser.rs
View File

@@ -77,7 +77,7 @@ impl<'a> Iterator for Parser<'a> {
Ok(None) => break,
Ok(Some(token)) if token.token_type == Some(TokenType::TK_SEMI) => {
found_semi = true;
self.eat_expect(&[TokenType::TK_SEMI]).unwrap();
self.eat_assert(&[TokenType::TK_SEMI]);
}
Ok(Some(token)) => {
if !found_semi {
@@ -217,15 +217,16 @@ impl<'a> Parser<'a> {
fn parse_stmt(&mut self) -> Result<Stmt, Error> {
let tok = self.peek_expect(&[
TokenType::TK_BEGIN,
TokenType::TK_COMMIT,
TokenType::TK_END,
// add more
])?;
let stmt = match tok.token_type.unwrap() {
TokenType::TK_BEGIN => self.parse_begin()?,
match tok.token_type.unwrap() {
TokenType::TK_BEGIN => self.parse_begin(),
TokenType::TK_COMMIT | TokenType::TK_END => self.parse_commit(),
_ => unreachable!(),
};
return Ok(stmt);
}
}
#[inline(always)]
@@ -254,6 +255,24 @@ impl<'a> Parser<'a> {
}
}
#[inline(always)]
fn parse_transopt(&mut self) -> Result<Option<Name>, Error> {
match self.peek_ignore_eof()? {
None => Ok(None),
Some(tok) => match tok.token_type.unwrap() {
TokenType::TK_TRANSACTION => {
self.eat_assert(&[TokenType::TK_TRANSACTION]);
if self.peek_nm().ok().is_some() {
Ok(self.parse_nm().ok())
} else {
Ok(None)
}
}
_ => Ok(None),
},
}
}
#[inline(always)]
fn parse_begin(&mut self) -> Result<Stmt, Error> {
self.eat_assert(&[TokenType::TK_BEGIN]);
@@ -277,24 +296,17 @@ impl<'a> Parser<'a> {
},
};
let trans_opt = match self.peek_ignore_eof()? {
None => None,
Some(tok) => match tok.token_type.unwrap() {
TokenType::TK_TRANSACTION => {
self.eat_assert(&[TokenType::TK_TRANSACTION]);
if self.peek_nm().ok().is_some() {
self.parse_nm().ok()
} else {
None
}
}
_ => None,
},
};
Ok(Stmt::Begin {
typ: transtype,
name: trans_opt,
name: self.parse_transopt()?,
})
}
#[inline(always)]
fn parse_commit(&mut self) -> Result<Stmt, Error> {
self.eat_assert(&[TokenType::TK_COMMIT, TokenType::TK_END]);
Ok(Stmt::Commit {
name: self.parse_transopt()?,
})
}
}
@@ -402,9 +414,38 @@ mod tests {
],
),
// commit
(
b"COMMIT".as_slice(),
vec![Cmd::Stmt(Stmt::Commit { name: None })],
),
(
b"END".as_slice(),
vec![Cmd::Stmt(Stmt::Commit { name: None })],
),
(
b"COMMIT TRANSACTION".as_slice(),
vec![Cmd::Stmt(Stmt::Commit { name: None })],
),
(
b"END TRANSACTION".as_slice(),
vec![Cmd::Stmt(Stmt::Commit { name: None })],
),
(
b"COMMIT TRANSACTION my_transaction".as_slice(),
vec![Cmd::Stmt(Stmt::Commit {
name: Some(Name::Ident("my_transaction".to_string())),
})],
),
(
b"END TRANSACTION my_transaction".as_slice(),
vec![Cmd::Stmt(Stmt::Commit {
name: Some(Name::Ident("my_transaction".to_string())),
})],
),
];
for (input, expected) in test_cases {
println!("Testing input: {:?}", from_bytes(input));
let mut parser = Parser::new(input);
let mut results = Vec::new();
while let Some(cmd) = parser.next() {