diff --git a/apps/emqx_bridge_cassandra/rebar.config b/apps/emqx_bridge_cassandra/rebar.config index c0a72fef9..04ee603fa 100644 --- a/apps/emqx_bridge_cassandra/rebar.config +++ b/apps/emqx_bridge_cassandra/rebar.config @@ -2,7 +2,7 @@ {erl_opts, [debug_info]}. {deps, [ - {ecql, {git, "https://github.com/emqx/ecql.git", {tag, "v0.5.2"}}}, + {ecql, {git, "https://github.com/emqx/ecql.git", {tag, "v0.6.0"}}}, {emqx_connector, {path, "../../apps/emqx_connector"}}, {emqx_resource, {path, "../../apps/emqx_resource"}}, {emqx_bridge, {path, "../../apps/emqx_bridge"}} diff --git a/apps/emqx_bridge_cassandra/src/emqx_bridge_cassandra_connector.erl b/apps/emqx_bridge_cassandra/src/emqx_bridge_cassandra_connector.erl index 3db71c9e0..3b30f1d26 100644 --- a/apps/emqx_bridge_cassandra/src/emqx_bridge_cassandra_connector.erl +++ b/apps/emqx_bridge_cassandra/src/emqx_bridge_cassandra_connector.erl @@ -159,7 +159,7 @@ on_add_channel(_InstId, #{channels := Channs} = OldState, ChannId, ChannConf0) - #{parameters := #{cql := CQL}} = ChannConf0, {PrepareCQL, ParamsTokens} = emqx_placeholder:preproc_sql(CQL, '?'), ParsedCql = #{ - prepare_key => short_prepare_key(ChannId), + prepare_key => make_prepare_key(ChannId), prepare_cql => PrepareCQL, params_tokens => ParamsTokens }, @@ -462,10 +462,5 @@ maybe_assign_type(V) when is_float(V) -> {double, V}; maybe_assign_type(V) -> V. -short_prepare_key(Str) when is_binary(Str) -> - true = size(Str) > 0, - Sha = crypto:hash(sha, Str), - %% TODO: change to binary:encode_hex(X, lowercase) when OTP version is always > 25 - Hex = string:lowercase(binary:encode_hex(Sha)), - <> = Hex, - binary_to_atom(<<"cassa_prepare_key:", UniqueEnough/binary>>). +make_prepare_key(ChannId) -> + ChannId.