From a684eb63eacac72cde7d6979f0b9006fafdfa637 Mon Sep 17 00:00:00 2001
From: Aleksei Nikiforov <darktemplar@altlinux.org>
Date: Wed, 5 Aug 2020 16:17:23 +0300
Subject: [PATCH] Revert "Use old pg2 only in Erlang/OTP older than 23
 (processone/ejabberd#3284)"

This reverts commit 3c494b8d82ad336547841de6b315af7fdb3a6357.
---
 rebar.config          |  3 +--
 src/cache_tab_app.erl | 16 +++-------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/rebar.config b/rebar.config
index b5e101a..663d1d2 100644
--- a/rebar.config
+++ b/rebar.config
@@ -20,8 +20,7 @@
 %%%
 %%%----------------------------------------------------------------------
 
-{erl_opts, [{platform_define, "^(R|1|20|21|22)", 'USE_OLD_PG2'},
-            debug_info]}.
+{erl_opts, [debug_info]}.
 
 {deps, [{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.20"}}}]}.
 
diff --git a/src/cache_tab_app.erl b/src/cache_tab_app.erl
index c313331..1ca3cca 100644
--- a/src/cache_tab_app.erl
+++ b/src/cache_tab_app.erl
@@ -32,16 +32,6 @@
 
 -include("ets_cache.hrl").
 
--ifdef(USE_OLD_PG2).
-pg_create(PoolName) -> pg2:create(PoolName).
-pg_join(PoolName, Pid) -> pg2:join(PoolName, Pid).
-pg_get_members(Name) -> pg2:get_members(Name).
--else.
-pg_create(_) -> pg:start_link().
-pg_join(PoolName, Pid) -> pg:join(PoolName, Pid).
-pg_get_members(Group) -> pg:get_members(Group).
--endif.
-
 %%%===================================================================
 %%% Application callbacks
 %%%===================================================================
@@ -65,8 +55,8 @@ pg_get_members(Group) -> pg:get_members(Group).
 start(_StartType, _StartArgs) ->
     case cache_tab_sup:start_link() of
         {ok, Pid} ->
-            pg_create(?PG),
-            pg_join(?PG, Pid),
+            pg2:create(?PG),
+            pg2:join(?PG, Pid),
 	    application:start(p1_utils),
 	    init_ets_cache_options(),
             {ok, Pid};
@@ -88,7 +78,7 @@ stop(_State) ->
     ok.
 
 get_nodes() ->
-    [node(P) || P <- pg_get_members(?PG)].
+    [node(P) || P <- pg2:get_members(?PG)].
 
 %%%===================================================================
 %%% Internal functions
-- 
2.25.4