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 2019/07/23 20:13:32 UTC
[couchdb] 23/25: Make fabric2.hrl public
This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch prototype/views
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 3ed94108075bade99c011dd75ec526b217f2803b
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Tue Jul 23 15:12:18 2019 -0500
Make fabric2.hrl public
---
src/couch_views/src/couch_views_fdb.erl | 2 +-
src/couch_views/src/couch_views_indexer.erl | 5 +++--
src/couch_views/src/couch_views_reader.erl | 2 +-
src/fabric/{src => include}/fabric2.hrl | 0
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/couch_views/src/couch_views_fdb.erl b/src/couch_views/src/couch_views_fdb.erl
index 16da0fc..09a9802 100644
--- a/src/couch_views/src/couch_views_fdb.erl
+++ b/src/couch_views/src/couch_views_fdb.erl
@@ -32,7 +32,7 @@
-include_lib("couch_mrview/include/couch_mrview.hrl").
--include_lib("fabric/src/fabric2.hrl").
+-include_lib("fabric/include/fabric2.hrl").
-include("couch_views.hrl").
% View Build Sequence Access
diff --git a/src/couch_views/src/couch_views_indexer.erl b/src/couch_views/src/couch_views_indexer.erl
index decec42..0000700 100644
--- a/src/couch_views/src/couch_views_indexer.erl
+++ b/src/couch_views/src/couch_views_indexer.erl
@@ -21,10 +21,11 @@
init/0
]).
+
+-include("couch_views.hrl").
-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").
--include_lib("fabric/src/fabric2.hrl").
--include("couch_views.hrl").
+-include_lib("fabric/include/fabric2.hrl").
% TODO:
% * Handle timeouts of transaction and other errors
diff --git a/src/couch_views/src/couch_views_reader.erl b/src/couch_views/src/couch_views_reader.erl
index c26b313..ce5097ba 100644
--- a/src/couch_views/src/couch_views_reader.erl
+++ b/src/couch_views/src/couch_views_reader.erl
@@ -20,7 +20,7 @@
-include("couch_views.hrl").
-include_lib("couch/include/couch_db.hrl").
-include_lib("couch_mrview/include/couch_mrview.hrl").
--include_lib("fabric/src/fabric2.hrl").
+-include_lib("fabric/include/fabric2.hrl").
read(Db, Mrst, ViewName, UserCallback, UserAcc0, Args) ->
diff --git a/src/fabric/src/fabric2.hrl b/src/fabric/include/fabric2.hrl
similarity index 100%
rename from src/fabric/src/fabric2.hrl
rename to src/fabric/include/fabric2.hrl