diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2010-07-08 19:31:43 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2010-07-08 19:31:43 +0000 |
| commit | f6fc698327df18c0517b2428e8834c5587e999bb (patch) | |
| tree | d3e8178a0e129b3674f36956e1b53e84005c4952 /src/couchdb | |
| parent | 1ec57b3b96c7584af0a2a279345094da72208265 (diff) | |
Merge revision 961893 from trunk:
Fix deletion of view files after compaction.
Also added test for view compaction.
Thanks Adam for reporting the issue.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@961897 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb')
| -rw-r--r-- | src/couchdb/couch_view_group.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/couchdb/couch_view_group.erl b/src/couchdb/couch_view_group.erl index 8d3a3d86..f01befdf 100644 --- a/src/couchdb/couch_view_group.erl +++ b/src/couchdb/couch_view_group.erl @@ -186,7 +186,7 @@ handle_cast({compact_done, #group{current_seq=NewSeq} = NewGroup}, ?LOG_INFO("View index compaction complete for ~s ~s", [DbName, GroupId]), FileName = index_file_name(RootDir, DbName, GroupSig), CompactName = index_file_name(compact, RootDir, DbName, GroupSig), - couch_file:delete(FileName), + ok = couch_file:delete(RootDir, FileName), ok = file:rename(CompactName, FileName), %% if an updater is running, kill it and start a new one @@ -545,7 +545,7 @@ reset_file(Db, Fd, DbName, #group{sig=Sig,name=Name} = Group) -> init_group(Db, Fd, reset_group(Group), nil). delete_index_file(RootDir, DbName, GroupSig) -> - couch_file:delete(index_file_name(RootDir, DbName, GroupSig)). + couch_file:delete(RootDir, index_file_name(RootDir, DbName, GroupSig)). init_group(Db, Fd, #group{views=Views}=Group, nil) -> init_group(Db, Fd, Group, |