[couchdb] 01/01: Revert "Close LRU by database path for deleted database/index"

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jiangphcn pushed a commit to branch revert-2130-close-lru
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 1bdddbc3f37a0c0fe1f0af4e9b9f547980390121
Author: Peng Hui Jiang <ji...@apache.org>
AuthorDate: Fri Nov 22 18:23:13 2019 +0800

    Revert "Close LRU by database path for deleted database/index"
---
 src/dreyfus/src/clouseau_rpc.erl          | 7 +------
 src/dreyfus/src/dreyfus_index_manager.erl | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/dreyfus/src/clouseau_rpc.erl b/src/dreyfus/src/clouseau_rpc.erl
index 215adae..b8190b3 100644
--- a/src/dreyfus/src/clouseau_rpc.erl
+++ b/src/dreyfus/src/clouseau_rpc.erl
@@ -22,7 +22,7 @@
 -export([group1/7, group2/2]).
 -export([delete/2, update/3, cleanup/1, cleanup/2, rename/1]).
 -export([analyze/2, version/0, disk_size/1]).
--export([set_purge_seq/2, get_purge_seq/1, get_root_dir/0, close_lru/0, close_lru/1]).
+-export([set_purge_seq/2, get_purge_seq/1, get_root_dir/0]).
 -export([connected/0]).
 
 open_index(Peer, Path, Analyzer) ->
@@ -32,10 +32,6 @@ disk_size(Path) ->
     rpc({main, clouseau()}, {disk_size, Path}).
 get_root_dir() ->
     rpc({main, clouseau()}, {get_root_dir}).
-close_lru() ->
-    rpc({main, clouseau()}, {close_lru}).
-close_lru(DbName) ->
-    rpc({main, clouseau()}, {close_lru_by_path, DbName}).
 
 await(Ref, MinSeq) ->
     rpc(Ref, {await, MinSeq}).
@@ -85,7 +81,6 @@ cleanup(DbName) ->
     gen_server:cast({cleanup, clouseau()}, {cleanup, DbName}).
 
 rename(DbName) ->
-  close_lru(DbName),
   gen_server:cast({cleanup, clouseau()}, {rename, DbName}).
 
 cleanup(DbName, ActiveSigs) ->
diff --git a/src/dreyfus/src/dreyfus_index_manager.erl b/src/dreyfus/src/dreyfus_index_manager.erl
index e0fee5e..47f2542 100644
--- a/src/dreyfus/src/dreyfus_index_manager.erl
+++ b/src/dreyfus/src/dreyfus_index_manager.erl
@@ -123,7 +123,6 @@ handle_db_event(DbName, deleted, _St) ->
         "enable_database_recovery", false),
     case RecoveryEnabled of
         true ->
-            clouseau_rpc:close_lru(DbName),
             gen_server:cast(?MODULE, {rename, DbName});
         false ->
             gen_server:cast(?MODULE, {cleanup, DbName})