diff options
| author | Peng Hui Jiang <jiangph@cn.ibm.com> | 2019-11-22 20:34:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 20:34:33 +0800 |
| commit | 0155bd884bd8c455cc4057811cf67035b04c427f (patch) | |
| tree | d77c2cc36ccf9c3fe1358e9d5f5fb9e3850c63f3 | |
| parent | 5ec35a949349751f34a0eca5fb2fc0267168fdc2 (diff) | |
| parent | 1bdddbc3f37a0c0fe1f0af4e9b9f547980390121 (diff) | |
| download | couchdb-0155bd884bd8c455cc4057811cf67035b04c427f.tar.gz | |
Merge pull request #2325 from apache/revert-2130-close-lru
Revert "Close LRU by database path for deleted database/index"
| -rw-r--r-- | src/dreyfus/src/clouseau_rpc.erl | 7 | ||||
| -rw-r--r-- | src/dreyfus/src/dreyfus_index_manager.erl | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/dreyfus/src/clouseau_rpc.erl b/src/dreyfus/src/clouseau_rpc.erl index 215adaee9..b8190b32c 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 e0fee5e40..47f254243 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}) |