@@ -7,15 +7,14 @@ use std::path::{Path, PathBuf};
77use std:: process:: { Command , ExitCode } ;
88use std:: time:: Duration ;
99
10+ use clap:: ValueEnum ;
1011use serde_json:: { Value , json} ;
1112
1213use crate :: check:: main:: check_coverage:: check_coverage;
1314use crate :: check:: models:: {
1415 CheckResult , FormResult , LocalFailure , LocalVerdict , ObligationResult , Reason ,
1516} ;
16- use crate :: cli:: _helpers:: local:: {
17- frozen_catalogue, parser_tree, postgres_verdict, snowflake_verdict,
18- } ;
17+ use crate :: cli:: _helpers:: local:: { frozen_catalogue, local_verdict, parser_tree} ;
1918use crate :: cli:: _helpers:: output:: { print, say} ;
2019use crate :: cli:: _helpers:: worker:: Worker ;
2120use crate :: cli:: models:: { Common , TranslationArguments } ;
@@ -53,10 +52,12 @@ const PARSE_MEMORY_KIB: u64 = 4 * 1024 * 1024;
5352
5453/// The worker command: this binary, its memory bounded by the shell before it starts.
5554fn worker_command ( binary : PathBuf , local_parser : LocalParser ) -> Box < dyn Fn ( ) -> Command > {
56- let worker: & str = match local_parser {
57- LocalParser :: Postgres => "parse-worker --postgres" ,
58- LocalParser :: Snowflake | LocalParser :: None => "parse-worker" ,
59- } ;
55+ let worker: String = format ! (
56+ "parse-worker --parser {}" ,
57+ local_parser
58+ . to_possible_value( )
59+ . map_or_else( String :: new, |value| value. get_name( ) . to_owned( ) )
60+ ) ;
6061 Box :: new ( move || {
6162 let mut command = Command :: new ( "sh" ) ;
6263 command
@@ -101,9 +102,10 @@ fn checked(coverage: &SyntaxCoverage) -> Result<CheckResult, ExitCode> {
101102 worker_command ( binary, local_parser) ,
102103 PARSE_BOUND ,
103104 ) ) ;
104- let check: CheckResult = check_coverage ( coverage, tree. as_deref ( ) , & |sql| match local_parser {
105- LocalParser :: Snowflake | LocalParser :: Postgres => worker. borrow_mut ( ) . verdict ( sql) ,
106- LocalParser :: None => LocalVerdict :: Failed {
105+ let parses: bool = local_verdict ( local_parser) . is_some ( ) ;
106+ let check: CheckResult = check_coverage ( coverage, tree. as_deref ( ) , & |sql| match parses {
107+ true => worker. borrow_mut ( ) . verdict ( sql) ,
108+ false => LocalVerdict :: Failed {
107109 failure : LocalFailure :: NoParser ,
108110 } ,
109111 } ) ;
@@ -521,11 +523,8 @@ pub(crate) fn diff(
521523}
522524
523525/// Reads one JSON string of SQL per line and prints the local verdict on each, flushed.
524- pub ( crate ) fn parse_worker ( postgres : bool ) -> Result < ExitCode , ExitCode > {
525- let verdict_of: fn ( & str ) -> LocalVerdict = match postgres {
526- true => postgres_verdict,
527- false => snowflake_verdict,
528- } ;
526+ pub ( crate ) fn parse_worker ( parser : LocalParser ) -> Result < ExitCode , ExitCode > {
527+ let verdict_of: fn ( & str ) -> LocalVerdict = local_verdict ( parser) . ok_or ( ExitCode :: FAILURE ) ?;
529528 let stdout = std:: io:: stdout ( ) ;
530529 for line in std:: io:: stdin ( ) . lock ( ) . lines ( ) {
531530 let line: String = line. map_err ( |_| ExitCode :: FAILURE ) ?;
0 commit comments