From 75c1592e7ca4a114ed7d1b3773f1ad6a9d974c9d Mon Sep 17 00:00:00 2001 From: JianBo He Date: Fri, 17 Mar 2023 11:34:12 +0800 Subject: [PATCH] chore: make static_checks happy --- lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_cassa.erl | 6 +++--- .../src/emqx_ee_connector_cassa.erl | 12 +++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_cassa.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_cassa.erl index 295d2c3b5..9df41c81e 100644 --- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_cassa.erl +++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_cassa.erl @@ -25,7 +25,7 @@ desc/1 ]). --define(DEFAULT_SQL, << +-define(DEFAULT_CQL, << "insert into mqtt_msg(topic, msgid, sender, qos, payload, arrived, retain) " "values (${topic}, ${id}, ${clientid}, ${qos}, ${payload}, ${timestamp}, ${flags.retain})" >>). @@ -55,7 +55,7 @@ values(post, Type) -> pool_size => 8, username => <<"root">>, password => <<"public">>, - sql => ?DEFAULT_SQL, + sql => ?DEFAULT_CQL, local_topic => <<"local/topic/#">>, resource_opts => #{ worker_pool_size => 8, @@ -83,7 +83,7 @@ fields("config") -> {sql, mk( binary(), - #{desc => ?DESC("sql_template"), default => ?DEFAULT_SQL, format => <<"sql">>} + #{desc => ?DESC("sql_template"), default => ?DEFAULT_CQL, format => <<"sql">>} )}, {local_topic, mk( 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 d1901e462..6b7084e9e 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 @@ -172,7 +172,7 @@ on_stop(InstId, #{poolname := PoolName}) -> emqx_resource:resource_id(), request(), state() -) -> emqx_resource:query_result(). +) -> ok | {ok, ecql:cql_result()} | {error, {recoverable_error | unrecoverable_error, term()}}. on_query( InstId, Request, @@ -397,12 +397,10 @@ assign_type_for_params([], Acc) -> assign_type_for_params([Param | More], Acc) -> assign_type_for_params(More, [may_assign_type(Param) | Acc]). -may_assign_type(V) when is_boolean(V) -> - {int, - if - V -> 1; - true -> 0 - end}; +may_assign_type(true) -> + {int, 1}; +may_assign_type(false) -> + {int, 0}; may_assign_type(V) when is_binary(V); is_list(V); is_atom(V) -> V; may_assign_type(V) when is_integer(V) -> %% The max value of signed int(4) is 2147483647