couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject fabric commit: updated refs/heads/master to e46ab8f
Date Sat, 12 Sep 2015 18:31:12 GMT
Repository: couchdb-fabric
Updated Branches:
  refs/heads/master 140bcfacb -> e46ab8fb7


Revert "add clusterwide compaction for dbs"

This reverts commit 140bcfacbb220bc3b47697fdd7b8b306eb6d7330.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/e46ab8fb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/e46ab8fb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/e46ab8fb

Branch: refs/heads/master
Commit: e46ab8fb7ac9a08bc503c64cf1e107e2b9574289
Parents: 140bcfa
Author: Robert Newson <rnewson@apache.org>
Authored: Sat Sep 12 19:30:58 2015 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Sat Sep 12 19:30:58 2015 +0100

----------------------------------------------------------------------
 src/fabric.erl     |  6 +-----
 src/fabric_rpc.erl | 11 +----------
 2 files changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/e46ab8fb/src/fabric.erl
----------------------------------------------------------------------
diff --git a/src/fabric.erl b/src/fabric.erl
index c52c10a..07c4c9c 100644
--- a/src/fabric.erl
+++ b/src/fabric.erl
@@ -33,7 +33,7 @@
 
 % miscellany
 -export([design_docs/1, reset_validation_funs/1, cleanup_index_files/0,
-    cleanup_index_files/1, dbname/1, compact_db/1]).
+    cleanup_index_files/1, dbname/1]).
 
 -include_lib("fabric/include/fabric.hrl").
 
@@ -411,10 +411,6 @@ reset_validation_funs(DbName) ->
     [rexi:cast(Node, {fabric_rpc, reset_validation_funs, [Name]}) ||
         #shard{node=Node, name=Name} <-  mem3:shards(DbName)].
 
-compact_db(DbName) ->
-    [rexi:cast(Node, {fabric_rpc, compact_db, [Name]}) ||
-        #shard{node=Node, name=Name} <- mem3:shards(DbName)].
-
 %% @doc clean up index files for all Dbs
 -spec cleanup_index_files() -> [ok].
 cleanup_index_files() ->

http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/e46ab8fb/src/fabric_rpc.erl
----------------------------------------------------------------------
diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl
index aef34bc..057dec3 100644
--- a/src/fabric_rpc.erl
+++ b/src/fabric_rpc.erl
@@ -21,8 +21,7 @@
 -export([get_all_security/2, open_shard/2]).
 
 -export([get_db_info/2, get_doc_count/2, get_update_seq/2,
-         changes/4, map_view/5, reduce_view/5, group_info/3,
-         compact_db/1]).
+         changes/4, map_view/5, reduce_view/5, group_info/3]).
 
 -include_lib("fabric/include/fabric.hrl").
 -include_lib("couch/include/couch_db.hrl").
@@ -133,14 +132,6 @@ delete_db(DbName) ->
 delete_shard_db_doc(_, DocId) ->
     rexi:reply(mem3_util:delete_db_doc(DocId)).
 
-compact_db(DbName) ->
-    {ok, Db} = couch_db:open(DbName, [?ADMIN_CTX]),
-    try
-        {ok, _} = couch_db:start_compact(Db)
-    after
-        couch_db:close(Db)
-    end.
-
 %% @equiv get_db_info(DbName, [])
 get_db_info(DbName) ->
     get_db_info(DbName, []).


Mime
View raw message