@@ -1516,39 +1516,18 @@ impl ModuleSubscriptions {
15161516 timer : Instant ,
15171517 _assert : Option < AssertTxFn > ,
15181518 ) -> Result < ( ExecutionMetrics , bool ) , DBError > {
1519- // Send an error message to the client.
1520- let send_err_msg = |message| {
1521- let _ = self . broadcast_queue . send_client_message_v1 (
1522- sender. clone ( ) ,
1523- None ,
1524- SubscriptionMessage {
1525- request_id : Some ( subscription. request_id ) ,
1526- query_id : None ,
1527- timer : Some ( timer) ,
1528- result : SubscriptionResult :: Error ( SubscriptionError {
1529- table_id : None ,
1530- message,
1531- } ) ,
1532- } ,
1533- ) ;
1534- } ;
1535-
15361519 // How many queries make up this subscription?
15371520 let subscription_metrics = & self . metrics . subscribe ;
15381521 let num_queries = subscription. query_strings . len ( ) ;
15391522 subscription_metrics. num_queries_subscribed . inc_by ( num_queries as _ ) ;
15401523
1541- let ( queries, auth, mut_tx, compile_timer) = return_on_err ! (
1542- self . compile_queries(
1543- sender. id. identity,
1544- auth,
1545- & subscription. query_strings,
1546- num_queries,
1547- subscription_metrics,
1548- ) ,
1549- send_err_msg,
1550- ( ExecutionMetrics :: default ( ) , false )
1551- ) ;
1524+ let ( queries, auth, mut_tx, compile_timer) = self . compile_queries (
1525+ sender. id . identity ,
1526+ auth,
1527+ & subscription. query_strings ,
1528+ num_queries,
1529+ subscription_metrics,
1530+ ) ?;
15521531
15531532 let ( mut tx, tx_offset, trapped) =
15541533 self . materialize_views_and_downgrade_tx ( mut_tx, instance, & queries, auth. caller ( ) ) ?;
0 commit comments