[couchdb] branch fabric-cleanup-view-files created (now b79916d)

[ji...@apache.org]

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

jiangphcn pushed a change to branch fabric-cleanup-view-files
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


      at b79916d  fixup fabric:cleanup_index_files

This branch includes the following new commits:

     new b79916d  fixup fabric:cleanup_index_files

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb] 01/01: fixup fabric:cleanup_index_files

[ji...@apache.org]

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

jiangphcn pushed a commit to branch fabric-cleanup-view-files
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit b79916d468ab81bd226c7bcbe348ce03414cfd6b
Author: jiangph <ji...@cn.ibm.com>
AuthorDate: Mon Sep 9 14:31:51 2019 +0800

    fixup fabric:cleanup_index_files
---
 src/fabric/src/fabric.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/fabric/src/fabric.erl b/src/fabric/src/fabric.erl
index d98ffc9..29c3449 100644
--- a/src/fabric/src/fabric.erl
+++ b/src/fabric/src/fabric.erl
@@ -525,7 +525,10 @@ inactive_index_files(DbName) ->
 
     if ActiveSigs =:= [] -> FileList; true ->
         lists:filter(fun(FilePath) ->
-            not maps:is_key(filename:basename(FilePath, ".view"), ActiveSigs)
+            ViewFilePath = filename:basename(FilePath, ".view"),
+            CompactViewFilePath = filename:basename(FilePath, "compact.view"),
+            (not maps:is_key(ViewFilePath, ActiveSigs))
+                and (not maps:is_key(CompactViewFilePath, ActiveSigs))
         end, FileList)
     end.