You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/13 00:28:58 UTC
[03/25] couch-mrview commit: updated refs/heads/1994-merge-rcouch to
7775266
inital move to rebar compilation
- move src/apps
- download dependencies using rebar
- replace ejson by jiffy
- replace couch_drv & couch_ejson_compare by couch_collate
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/674800bb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/674800bb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/674800bb
Branch: refs/heads/1994-merge-rcouch
Commit: 674800bbb8276db05f8f62cd971496acc5a46d10
Parents: 9f59339
Author: benoitc <be...@apache.org>
Authored: Mon Jan 6 21:12:45 2014 +0100
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Feb 12 17:27:38 2014 -0600
----------------------------------------------------------------------
src/couch_mrview.erl | 2 +-
src/couch_mrview_cleanup.erl | 4 +---
src/couch_mrview_compactor.erl | 4 ++--
src/couch_mrview_http.erl | 3 +--
src/couch_mrview_index.erl | 2 +-
src/couch_mrview_show.erl | 2 +-
src/couch_mrview_test_util.erl | 3 ++-
src/couch_mrview_updater.erl | 2 +-
src/couch_mrview_util.erl | 2 +-
9 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/674800bb/src/couch_mrview.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview.erl b/src/couch_mrview.erl
index 2964fe9..d31ed18 100644
--- a/src/couch_mrview.erl
+++ b/src/couch_mrview.erl
@@ -18,7 +18,7 @@
-export([compact/2, compact/3, cancel_compaction/2]).
-export([cleanup/1]).
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").
-record(mracc, {
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/674800bb/src/couch_mrview_cleanup.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_cleanup.erl b/src/couch_mrview_cleanup.erl
index d48de6f..c94b9f8 100644
--- a/src/couch_mrview_cleanup.erl
+++ b/src/couch_mrview_cleanup.erl
@@ -14,11 +14,9 @@
-export([run/1]).
-
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").
-
run(Db) ->
RootDir = couch_index_util:root_dir(),
DbName = couch_db:name(Db),
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/674800bb/src/couch_mrview_compactor.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_compactor.erl b/src/couch_mrview_compactor.erl
index fe718ca..4ab8dd1 100644
--- a/src/couch_mrview_compactor.erl
+++ b/src/couch_mrview_compactor.erl
@@ -12,7 +12,7 @@
-module(couch_mrview_compactor).
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").
-export([compact/3, swap_compacted/2]).
@@ -174,5 +174,5 @@ swap_compacted(OldState, NewState) ->
unlink(OldState#mrst.fd),
couch_ref_counter:drop(OldState#mrst.refc),
{ok, NewRefCounter} = couch_ref_counter:start([NewState#mrst.fd]),
-
+
{ok, NewState#mrst{refc=NewRefCounter}}.
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/674800bb/src/couch_mrview_http.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_http.erl b/src/couch_mrview_http.erl
index 7b92034..22e0dc3 100644
--- a/src/couch_mrview_http.erl
+++ b/src/couch_mrview_http.erl
@@ -22,8 +22,7 @@
parse_qs/2
]).
-
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/674800bb/src/couch_mrview_index.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_index.erl b/src/couch_mrview_index.erl
index 7466dbc..7506f34 100644
--- a/src/couch_mrview_index.erl
+++ b/src/couch_mrview_index.erl
@@ -18,7 +18,7 @@
-export([start_update/3, purge/4, process_doc/3, finish_update/1, commit/1]).
-export([compact/3, swap_compacted/2]).
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/674800bb/src/couch_mrview_show.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_show.erl b/src/couch_mrview_show.erl
index f8fa837..4ab8e17 100644
--- a/src/couch_mrview_show.erl
+++ b/src/couch_mrview_show.erl
@@ -18,7 +18,7 @@
handle_view_list_req/3
]).
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").
-record(lacc, {
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/674800bb/src/couch_mrview_test_util.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_test_util.erl b/src/couch_mrview_test_util.erl
index 338ae38..adc2675 100644
--- a/src/couch_mrview_test_util.erl
+++ b/src/couch_mrview_test_util.erl
@@ -14,7 +14,8 @@
-compile(export_all).
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
+
-define(ADMIN, #user_ctx{roles=[<<"_admin">>]}).
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/674800bb/src/couch_mrview_updater.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_updater.erl b/src/couch_mrview_updater.erl
index 9604ea9..980b5cf 100644
--- a/src/couch_mrview_updater.erl
+++ b/src/couch_mrview_updater.erl
@@ -14,7 +14,7 @@
-export([start_update/3, purge/4, process_doc/3, finish_update/1]).
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/674800bb/src/couch_mrview_util.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_util.erl b/src/couch_mrview_util.erl
index c4272f8..f7946d1 100644
--- a/src/couch_mrview_util.erl
+++ b/src/couch_mrview_util.erl
@@ -28,7 +28,7 @@
-define(MOD, couch_mrview_index).
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").