From 9560fdc5a2a48f40b5649636e90cf9372a244de0 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Wed, 12 Apr 2023 11:34:04 +0800 Subject: [PATCH] chore: typo fixes --- .../test/emqx_ee_bridge_cassa_SUITE.erl | 32 +++++++++++-------- .../src/emqx_ee_connector_cassa.erl | 6 ++-- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl index 826df9be8..208b68de6 100644 --- a/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl +++ b/lib-ee/emqx_ee_bridge/test/emqx_ee_bridge_cassa_SUITE.erl @@ -591,20 +591,24 @@ t_missing_data(Config) -> ), %% emqx_ee_connector_cassa will send missed data as a `null` atom %% to ecql driver - send_message(Config, #{}), - ?block_until( - #{ - ?snk_kind := buffer_worker_flush_ack, - result := {async_return, ok} - }, - 2_000 - ), - ?block_until( - #{ - ?snk_kind := handle_async_reply_enter, - result := {error, {8704, _}} - }, - 2_000 + ?check_trace( + begin + ?wait_async_action( + send_message(Config, #{}), + #{?snk_kind := handle_async_reply, result := {error, {8704, _}}}, + 10_000 + ), + ok + end, + fun(Trace0) -> + %% 1. ecql driver will return `ok` first in async query + Trace = ?of_kind(cassandra_connector_query_return, Trace0), + ?assertMatch([#{result := ok}], Trace), + %% 2. then it will return an error in callback function + Trace1 = ?of_kind(handle_async_reply, Trace0), + ?assertMatch([#{result := {error, {8704, _}}}], Trace1), + ok + end ), ok. diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl index 4b3804c01..1e1882a1f 100644 --- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl +++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_cassa.erl @@ -175,7 +175,7 @@ on_query( Request, State ) -> - do_signle_query(InstId, Request, sync, State). + do_single_query(InstId, Request, sync, State). -spec on_query_async( emqx_resource:resource_id(), @@ -189,9 +189,9 @@ on_query_async( Callback, State ) -> - do_signle_query(InstId, Request, {async, Callback}, State). + do_single_query(InstId, Request, {async, Callback}, State). -do_signle_query( +do_single_query( InstId, Request, Async,