From d5fa98523a59d55b5efb81536955786ab69d9501 Mon Sep 17 00:00:00 2001 From: Alexander Tishchenko Date: Fri, 5 Oct 2018 18:58:11 +0300 Subject: [PATCH] Make compilable again: Fix type references for queue, dict and gb_trees Replace the usage of erlang:now() --- include/emysql.hrl | 6 +++--- src/emysql.erl | 2 +- src/emysql_conn.erl | 2 +- src/emysql_conn_mgr.erl | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/emysql.hrl b/include/emysql.hrl index 1320289f..eabf87b7 100644 --- a/include/emysql.hrl +++ b/include/emysql.hrl @@ -34,9 +34,9 @@ port :: number(), database :: string(), encoding :: utf8 | latin1 | {utf8, utf8_unicode_ci} | {utf8, utf8_general_ci}, - available=queue:new() :: queue(), - locked=gb_trees:empty() :: gb_tree(), - waiting=queue:new() :: queue(), + available=queue:new() :: queue:queue(), + locked=gb_trees:empty() :: gb_trees:tree(), + waiting=queue:new() :: queue:queue(), start_cmds=[] :: string(), conn_test_period=0 :: number(), connect_timeout=infinity :: number() | infinity, diff --git a/src/emysql.erl b/src/emysql.erl index a373de9a..40467869 100644 --- a/src/emysql.erl +++ b/src/emysql.erl @@ -669,7 +669,7 @@ result_type(#eof_packet{}) -> eof. -spec as_dict(Result) -> Dict when Result :: #result_packet{}, - Dict :: dict(). + Dict :: dict:dict(). as_dict(Res) -> emysql_conv:as_dict(Res). diff --git a/src/emysql_conn.erl b/src/emysql_conn.erl index 01a5c74b..ff66e44f 100644 --- a/src/emysql_conn.erl +++ b/src/emysql_conn.erl @@ -334,7 +334,7 @@ need_test_connection(Conn) -> (Conn#emysql_connection.last_test_time + Conn#emysql_connection.test_period < now_seconds()). now_seconds() -> - {M, S, _} = erlang:now(), + {M, S, _} = erlang:timestamp(), M * 1000000 + S. %%-------------------------------------------------------------------- diff --git a/src/emysql_conn_mgr.erl b/src/emysql_conn_mgr.erl index b14a08d6..de33f34b 100644 --- a/src/emysql_conn_mgr.erl +++ b/src/emysql_conn_mgr.erl @@ -40,7 +40,7 @@ -include("emysql.hrl"). --record(state, {pools, lockers = dict:new() :: dict()}). +-record(state, {pools, lockers = dict:new() :: dict:dict()}). %%==================================================================== %% API @@ -419,7 +419,7 @@ lock_next_connection(Available ,Locked, Who) -> end. connection_locked_at(Conn, MonitorRef) -> - Conn#emysql_connection{locked_at=lists:nth(2, tuple_to_list(now())), + Conn#emysql_connection{locked_at=lists:nth(2, tuple_to_list(erlang:timestamp())), monitor_ref = MonitorRef}. serve_waiting_pids(Pool) ->