yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(pgsql connector): improvements due to suggestions from @thalesmg 

Co-authored-by: Thales Macedo Garitezi <thalesmg@gmail.com>
This commit is contained in:
Kjell Winblad 2024-06-04 09:46:55 +02:00
parent f2ccfff803
commit 572ca6433e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqx_postgresql/src/emqx_postgresql.erl
View File

@ -654,7 +654,7 @@ prepare_sql_to_conn(Conn, Prepares) ->
prepare_sql_to_conn(Conn, [], Statements, _Attempts) when is_pid(Conn) -> prepare_sql_to_conn(Conn, [], Statements, _Attempts) when is_pid(Conn) ->
{ok, Statements}; {ok, Statements};
prepare_sql_to_conn(Conn, [{Key, _} | _Rest], _Statements, 3) when is_pid(Conn) -> prepare_sql_to_conn(Conn, [{Key, _} | _Rest], _Statements, _MaxAttempts = 3) when is_pid(Conn) ->
{error, {failed_to_remove_prev_prepared_statement, Key}}; {error, {failed_to_remove_prev_prepared_statement, Key}};
prepare_sql_to_conn( prepare_sql_to_conn(
Conn, [{Key, {SQL, _RowTemplate}} | Rest] = ToPrepare, Statements, Attempts Conn, [{Key, {SQL, _RowTemplate}} | Rest] = ToPrepare, Statements, Attempts
@ -665,7 +665,7 @@ prepare_sql_to_conn(
case epgsql:parse2(Conn, Key, SQL, []) of case epgsql:parse2(Conn, Key, SQL, []) of
{ok, Statement} -> {ok, Statement} ->
prepare_sql_to_conn(Conn, Rest, Statements#{Key => Statement}, 0); prepare_sql_to_conn(Conn, Rest, Statements#{Key => Statement}, 0);
{error, {error, error, _, undefined_table, _, _} = Error} -> {error, #error{severity = error, codename = undefined_table} = Error} ->
%% Target table is not created %% Target table is not created
?tp(pgsql_undefined_table, #{}), ?tp(pgsql_undefined_table, #{}),
LogMsg = LogMsg =
@ -675,7 +675,7 @@ prepare_sql_to_conn(
), ),
?SLOG(error, LogMsg), ?SLOG(error, LogMsg),
{error, undefined_table}; {error, undefined_table};
{error, {error, error, _, duplicate_prepared_statement, _, _}} = Error -> {error, #error{severity = error, codename = duplicate_prepared_statement}} = Error ->
?tp(pgsql_prepared_statement_exists, #{}), ?tp(pgsql_prepared_statement_exists, #{}),
LogMsg = LogMsg =
maps:merge( maps:merge(
@ -693,7 +693,7 @@ prepare_sql_to_conn(
?SLOG(warning, LogMsg), ?SLOG(warning, LogMsg),
case epgsql:close(Conn, statement, Key) of case epgsql:close(Conn, statement, Key) of
ok -> ok ->
?SLOG(info, #{msg => "pqsql_closed_statement_succefully"}); ?SLOG(info, #{msg => "pqsql_closed_statement_successfully"});
{error, Error} -> {error, Error} ->
?SLOG(warning, #{msg => "pqsql_close_statement_failed", cause => Error}) ?SLOG(warning, #{msg => "pqsql_close_statement_failed", cause => Error})
end, end,