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/01/17 22:50:44 UTC
[44/50] git commit: New build system for fabric
New build system for fabric
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/0aa7fa98
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/0aa7fa98
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/0aa7fa98
Branch: refs/heads/import
Commit: 0aa7fa989abd4e7702f1007af4826994624ade5a
Parents: 336dcb3
Author: Paul J. Davis <pa...@gmail.com>
Authored: Tue Mar 5 17:43:02 2013 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Fri Jan 17 13:49:11 2014 -0800
----------------------------------------------------------------------
Makefile.am | 77 +++++++++
include/couch_db_tmp.hrl | 296 +++++++++++++++++++++++++++++++++
src/fabric.app.src | 35 +++-
src/fabric.erl | 2 +-
src/fabric_db_create.erl | 2 +-
src/fabric_db_delete.erl | 2 +-
src/fabric_db_doc_count.erl | 2 +-
src/fabric_db_info.erl | 2 +-
src/fabric_db_meta.erl | 2 +-
src/fabric_db_update_listener.erl | 2 +-
src/fabric_doc_attachments.erl | 2 +-
src/fabric_doc_missing_revs.erl | 2 +-
src/fabric_doc_open.erl | 2 +-
src/fabric_doc_open_revs.erl | 2 +-
src/fabric_doc_update.erl | 2 +-
src/fabric_group_info.erl | 2 +-
src/fabric_rpc.erl | 2 +-
src/fabric_util.erl | 2 +-
src/fabric_view.erl | 2 +-
src/fabric_view_all_docs.erl | 2 +-
src/fabric_view_changes.erl | 2 +-
src/fabric_view_map.erl | 2 +-
src/fabric_view_reduce.erl | 2 +-
23 files changed, 426 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..64ca935
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,77 @@
+## Licensed under the Apache License, Version 2.0 (the "License"); you may not
+## use this file except in compliance with the License. You may obtain a copy
+## of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+## License for the specific language governing permissions and limitations under
+## the License.
+
+fabricebindir = $(localerlanglibdir)/fabric/ebin
+
+fabricebin_DATA = $(compiled_files)
+
+source_files = \
+ src/fabric.app.src \
+ src/fabric.erl \
+ src/fabric_db_create.erl \
+ src/fabric_db_delete.erl \
+ src/fabric_db_doc_count.erl \
+ src/fabric_db_info.erl \
+ src/fabric_db_meta.erl \
+ src/fabric_db_update_listener.erl \
+ src/fabric_dict.erl \
+ src/fabric_doc_attachments.erl \
+ src/fabric_doc_missing_revs.erl \
+ src/fabric_doc_open.erl \
+ src/fabric_doc_open_revs.erl \
+ src/fabric_doc_update.erl \
+ src/fabric_group_info.erl \
+ src/fabric_rpc.erl \
+ src/fabric_util.erl \
+ src/fabric_view.erl \
+ src/fabric_view_all_docs.erl \
+ src/fabric_view_changes.erl \
+ src/fabric_view_map.erl \
+ src/fabric_view_reduce.erl
+
+compiled_files = \
+ ebin/fabric.app \
+ ebin/fabric.beam \
+ ebin/fabric_db_create.beam \
+ ebin/fabric_db_delete.beam \
+ ebin/fabric_db_doc_count.beam \
+ ebin/fabric_db_info.beam \
+ ebin/fabric_db_meta.beam \
+ ebin/fabric_db_update_listener.beam \
+ ebin/fabric_dict.beam \
+ ebin/fabric_doc_attachments.beam \
+ ebin/fabric_doc_missing_revs.beam \
+ ebin/fabric_doc_open.beam \
+ ebin/fabric_doc_open_revs.beam \
+ ebin/fabric_doc_update.beam \
+ ebin/fabric_group_info.beam \
+ ebin/fabric_util.beam
+
+# Conflicts in couch_db.hrl prevent us from building these
+# until after we merge the couch application
+# ebin/fabric_rpc.beam
+# ebin/fabric_view.beam
+# ebin/fabric_view_all_docs.beam
+# ebin/fabric_view_changes.beam
+# ebin/fabric_view_map.beam
+# ebin/fabric_view_reduce.beam
+
+EXTRA_DIST = $(source_files)
+CLEANFILES = $(compiled_files)
+
+ebin/%.app: src/%.app.src
+ @mkdir -p ebin/
+ sed -e "s|%version%|@version@|g" < $< > $@
+
+ebin/%.beam: src/%.erl
+ @mkdir -p ebin/
+ $(ERLC) -Wall -I$(top_srcdir)/src -o ebin/ $(ERLC_FLAGS) $<
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/include/couch_db_tmp.hrl
----------------------------------------------------------------------
diff --git a/include/couch_db_tmp.hrl b/include/couch_db_tmp.hrl
new file mode 100644
index 0000000..96f3a2f
--- /dev/null
+++ b/include/couch_db_tmp.hrl
@@ -0,0 +1,296 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-define(LOCAL_DOC_PREFIX, "_local/").
+-define(DESIGN_DOC_PREFIX0, "_design").
+-define(DESIGN_DOC_PREFIX, "_design/").
+
+-define(MIN_STR, <<"">>).
+-define(MAX_STR, <<255>>). % illegal utf string
+
+-define(JSON_ENCODE(V), couch_util:json_encode(V)).
+-define(JSON_DECODE(V), couch_util:json_decode(V)).
+
+-define(b2l(V), binary_to_list(V)).
+-define(l2b(V), list_to_binary(V)).
+
+-define(DEFAULT_ATTACHMENT_CONTENT_TYPE, <<"application/octet-stream">>).
+
+-define(LOG_DEBUG(Format, Args), twig:log(debug, Format, Args)).
+-define(LOG_INFO(Format, Args), twig:log(notice, Format, Args)).
+-define(LOG_ERROR(Format, Args), twig:log(error, Format, Args)).
+
+-record(rev_info,
+ {
+ rev,
+ seq = 0,
+ deleted = false,
+ body_sp = nil % stream pointer
+ }).
+
+-record(doc_info,
+ {
+ id = <<"">>,
+ high_seq = 0,
+ revs = [] % rev_info
+ }).
+
+-record(full_doc_info,
+ {id = <<"">>,
+ update_seq = 0,
+ deleted = false,
+ data_size = 0,
+ rev_tree = []
+ }).
+
+-record(httpd,
+ {mochi_req,
+ peer,
+ method,
+ path_parts,
+ db_url_handlers,
+ user_ctx,
+ req_body = undefined,
+ design_url_handlers,
+ auth,
+ default_fun,
+ url_handlers
+ }).
+
+
+-record(doc,
+ {
+ id = <<"">>,
+ revs = {0, []},
+
+ % the json body object.
+ body = {[]},
+
+ atts = [], % attachments
+
+ deleted = false,
+
+ % key/value tuple of meta information, provided when using special options:
+ % couch_db:open_doc(Db, Id, Options).
+ meta = []
+ }).
+
+
+-record(att,
+ {
+ name,
+ type,
+ att_len,
+ disk_len, % length of the attachment in its identity form
+ % (that is, without a content encoding applied to it)
+ % differs from att_len when encoding /= identity
+ md5= <<>>,
+ revpos=0,
+ data,
+ encoding=identity % currently supported values are:
+ % identity, gzip
+ % additional values to support in the future:
+ % deflate, compress
+ }).
+
+
+-record(user_ctx,
+ {
+ name=null,
+ roles=[],
+ handler
+ }).
+
+% This should be updated anytime a header change happens that requires more
+% than filling in new defaults.
+%
+% As long the changes are limited to new header fields (with inline
+% defaults) added to the end of the record, then there is no need to increment
+% the disk revision number.
+%
+% if the disk revision is incremented, then new upgrade logic will need to be
+% added to couch_db_updater:init_db.
+
+-define(LATEST_DISK_VERSION, 5).
+
+-record(db_header,
+ {disk_version = ?LATEST_DISK_VERSION,
+ update_seq = 0,
+ unused = 0,
+ id_tree_state = nil,
+ seq_tree_state = nil,
+ local_tree_state = nil,
+ purge_seq = 0,
+ purged_docs = nil,
+ security_ptr = nil,
+ revs_limit = 1000
+ }).
+
+-record(db,
+ {main_pid = nil,
+ update_pid = nil,
+ compactor_pid = nil,
+ instance_start_time, % number of microsecs since jan 1 1970 as a binary string
+ fd,
+ fd_monitor,
+ header = #db_header{},
+ committed_update_seq,
+ id_tree,
+ seq_tree,
+ local_tree,
+ update_seq,
+ name,
+ filepath,
+ validate_doc_funs = undefined,
+ security = [],
+ security_ptr = nil,
+ user_ctx = #user_ctx{},
+ waiting_delayed_commit = nil,
+ revs_limit = 1000,
+ fsync_options = [],
+ is_sys_db = false
+ }).
+
+
+-record(view_query_args, {
+ start_key,
+ end_key,
+ start_docid = ?MIN_STR,
+ end_docid = ?MAX_STR,
+
+ direction = fwd,
+ inclusive_end=true, % aka a closed-interval
+
+ limit = 10000000000, % Huge number to simplify logic
+ skip = 0,
+
+ group_level = 0,
+
+ view_type = nil,
+ include_docs = false,
+ stale = false,
+ multi_get = false,
+ callback = nil,
+ list = nil,
+ keys = nil,
+ sorted = true,
+ extra = []
+}).
+
+-record(view_fold_helper_funs, {
+ reduce_count,
+ passed_end,
+ start_response,
+ send_row
+}).
+
+-record(reduce_fold_helper_funs, {
+ start_response,
+ send_row
+}).
+
+-record(extern_resp_args, {
+ code = 200,
+ stop = false,
+ data = <<>>,
+ ctype = "application/json",
+ headers = [],
+ json = nil
+}).
+
+-record(group, {
+ sig=nil,
+ dbname,
+ fd=nil,
+ name,
+ def_lang,
+ design_options=[],
+ views,
+ id_btree=nil,
+ current_seq=0,
+ purge_seq=0,
+ query_server=nil,
+ waiting_delayed_commit=nil,
+ atts=[]
+ }).
+
+-record(view,
+ {id_num,
+ map_names=[],
+ def,
+ btree=nil,
+ reduce_funs=[],
+ dbcopies=[],
+ options=[]
+ }).
+
+-record(index_header,
+ {seq=0,
+ purge_seq=0,
+ id_btree_state=nil,
+ view_states=nil
+ }).
+
+-record(http_db, {
+ url,
+ auth = [],
+ resource = "",
+ headers = [
+ {"User-Agent", "CouchDB/"++couch:version()},
+ {"Accept", "application/json"},
+ {"Accept-Encoding", "gzip"}
+ ],
+ qs = [],
+ method = get,
+ body = nil,
+ options = [
+ {response_format,binary},
+ {inactivity_timeout, 30000}
+ ],
+ retries = 10,
+ pause = 500,
+ conn = nil
+}).
+
+% small value used in revision trees to indicate the revision isn't stored
+-define(REV_MISSING, []).
+
+-record(changes_args, {
+ feed = "normal",
+ dir = fwd,
+ since = "0",
+ limit = 1000000000000000,
+ style = main_only,
+ heartbeat,
+ timeout,
+ filter,
+ include_docs = false
+}).
+
+-record(proc, {
+ pid,
+ lang,
+ client = nil,
+ ddoc_keys = [],
+ prompt_fun,
+ set_timeout_fun,
+ stop_fun,
+ data_fun
+}).
+
+-record(leaf, {
+ deleted,
+ ptr,
+ seq,
+ size = 0,
+ atts = []
+}).
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric.app.src
----------------------------------------------------------------------
diff --git a/src/fabric.app.src b/src/fabric.app.src
index 876b275..3f3b167 100644
--- a/src/fabric.app.src
+++ b/src/fabric.app.src
@@ -1,6 +1,37 @@
{application, fabric, [
{description, "Routing and proxying layer for CouchDB cluster"},
- {vsn, git},
+ {vsn, "%version%"},
+ {modules, [
+ fabric,
+ fabric_db_create,
+ fabric_db_delete,
+ fabric_db_doc_count,
+ fabric_db_info,
+ fabric_db_meta,
+ fabric_db_update_listener,
+ fabric_dict,
+ fabric_doc_attachments,
+ fabric_doc_missing_revs,
+ fabric_doc_open,
+ fabric_doc_open_revs,
+ fabric_doc_update,
+ fabric_group_info,
+ fabric_rpc,
+ fabric_util,
+ fabric_view,
+ fabric_view_all_docs,
+ fabric_view_changes,
+ fabric_view_map,
+ fabric_view_reduce
+ ]},
{registered, []},
- {applications, [kernel, stdlib, config, couch, rexi, mem3, twig]}
+ {applications, [
+ kernel,
+ stdlib,
+ config,
+ couch,
+ rexi,
+ mem3,
+ twig
+ ]}
]}.
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric.erl
----------------------------------------------------------------------
diff --git a/src/fabric.erl b/src/fabric.erl
index fe6bf6c..2899545 100644
--- a/src/fabric.erl
+++ b/src/fabric.erl
@@ -37,7 +37,7 @@
-export([design_docs/1, reset_validation_funs/1, cleanup_index_files/0,
cleanup_index_files/1]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-type dbname() :: (iodata() | #db{}).
-type docid() :: iodata().
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_db_create.erl
----------------------------------------------------------------------
diff --git a/src/fabric_db_create.erl b/src/fabric_db_create.erl
index 080517b..4f3fcae 100644
--- a/src/fabric_db_create.erl
+++ b/src/fabric_db_create.erl
@@ -15,7 +15,7 @@
-module(fabric_db_create).
-export([go/2]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_db_delete.erl
----------------------------------------------------------------------
diff --git a/src/fabric_db_delete.erl b/src/fabric_db_delete.erl
index 9283d0b..6b2a434 100644
--- a/src/fabric_db_delete.erl
+++ b/src/fabric_db_delete.erl
@@ -15,7 +15,7 @@
-module(fabric_db_delete).
-export([go/2]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
%% @doc Options aren't used at all now in couch on delete but are left here
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_db_doc_count.erl
----------------------------------------------------------------------
diff --git a/src/fabric_db_doc_count.erl b/src/fabric_db_doc_count.erl
index 8c4ff20..0ef8221 100644
--- a/src/fabric_db_doc_count.erl
+++ b/src/fabric_db_doc_count.erl
@@ -16,7 +16,7 @@
-export([go/1]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_db_info.erl
----------------------------------------------------------------------
diff --git a/src/fabric_db_info.erl b/src/fabric_db_info.erl
index 4903f03..b8cb605 100644
--- a/src/fabric_db_info.erl
+++ b/src/fabric_db_info.erl
@@ -16,7 +16,7 @@
-export([go/1]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
go(DbName) ->
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_db_meta.erl
----------------------------------------------------------------------
diff --git a/src/fabric_db_meta.erl b/src/fabric_db_meta.erl
index 3a27f33..ca21b0f 100644
--- a/src/fabric_db_meta.erl
+++ b/src/fabric_db_meta.erl
@@ -16,7 +16,7 @@
-export([set_revs_limit/3, set_security/3, get_all_security/2]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_db_update_listener.erl
----------------------------------------------------------------------
diff --git a/src/fabric_db_update_listener.erl b/src/fabric_db_update_listener.erl
index 572e955..7d6d878 100644
--- a/src/fabric_db_update_listener.erl
+++ b/src/fabric_db_update_listener.erl
@@ -16,7 +16,7 @@
-export([go/4, start_update_notifier/1, stop/1, wait_db_updated/1]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-record(worker, {
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_doc_attachments.erl
----------------------------------------------------------------------
diff --git a/src/fabric_doc_attachments.erl b/src/fabric_doc_attachments.erl
index 430ad27..54f96a3 100644
--- a/src/fabric_doc_attachments.erl
+++ b/src/fabric_doc_attachments.erl
@@ -14,7 +14,7 @@
-module(fabric_doc_attachments).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("couch/include/couch_db.hrl").
%% couch api calls
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_doc_missing_revs.erl
----------------------------------------------------------------------
diff --git a/src/fabric_doc_missing_revs.erl b/src/fabric_doc_missing_revs.erl
index 2dd04a7..57ba90c 100644
--- a/src/fabric_doc_missing_revs.erl
+++ b/src/fabric_doc_missing_revs.erl
@@ -16,7 +16,7 @@
-export([go/2, go/3]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
go(DbName, AllIdsRevs) ->
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_doc_open.erl
----------------------------------------------------------------------
diff --git a/src/fabric_doc_open.erl b/src/fabric_doc_open.erl
index d6db1e1..9ec6e6d 100644
--- a/src/fabric_doc_open.erl
+++ b/src/fabric_doc_open.erl
@@ -16,7 +16,7 @@
-export([go/3]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_doc_open_revs.erl
----------------------------------------------------------------------
diff --git a/src/fabric_doc_open_revs.erl b/src/fabric_doc_open_revs.erl
index 60f26e1..f36bc9c 100644
--- a/src/fabric_doc_open_revs.erl
+++ b/src/fabric_doc_open_revs.erl
@@ -16,7 +16,7 @@
-export([go/4]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
-include_lib("eunit/include/eunit.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_doc_update.erl
----------------------------------------------------------------------
diff --git a/src/fabric_doc_update.erl b/src/fabric_doc_update.erl
index dd6f2ca..58e6449 100644
--- a/src/fabric_doc_update.erl
+++ b/src/fabric_doc_update.erl
@@ -16,7 +16,7 @@
-export([go/3]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_group_info.erl
----------------------------------------------------------------------
diff --git a/src/fabric_group_info.erl b/src/fabric_group_info.erl
index a0fa652..1a0f78a 100644
--- a/src/fabric_group_info.erl
+++ b/src/fabric_group_info.erl
@@ -16,7 +16,7 @@
-export([go/2]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_rpc.erl
----------------------------------------------------------------------
diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl
index 2a79583..ff69f95 100644
--- a/src/fabric_rpc.erl
+++ b/src/fabric_rpc.erl
@@ -22,7 +22,7 @@
set_revs_limit/3, create_shard_db_doc/2, delete_shard_db_doc/2]).
-export([get_all_security/2]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("couch/include/couch_db.hrl").
-record (view_acc, {
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_util.erl
----------------------------------------------------------------------
diff --git a/src/fabric_util.erl b/src/fabric_util.erl
index 0ff1735..91db5fc 100644
--- a/src/fabric_util.erl
+++ b/src/fabric_util.erl
@@ -19,7 +19,7 @@
remove_down_workers/2]).
-export([request_timeout/0]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
-include_lib("eunit/include/eunit.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_view.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view.erl b/src/fabric_view.erl
index 4107e61..479e718 100644
--- a/src/fabric_view.erl
+++ b/src/fabric_view.erl
@@ -18,7 +18,7 @@
transform_row/1, keydict/1, extract_view/4, get_shards/2,
remove_down_shards/2]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_view_all_docs.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view_all_docs.erl b/src/fabric_view_all_docs.erl
index 8a4ed84..c2b750d 100644
--- a/src/fabric_view_all_docs.erl
+++ b/src/fabric_view_all_docs.erl
@@ -17,7 +17,7 @@
-export([go/4]).
-export([open_doc/3]). % exported for spawn
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_view_changes.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view_changes.erl b/src/fabric_view_changes.erl
index d242fcd..3cc9e8c 100644
--- a/src/fabric_view_changes.erl
+++ b/src/fabric_view_changes.erl
@@ -16,7 +16,7 @@
-export([go/5, pack_seqs/1, unpack_seqs/2]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
-include_lib("eunit/include/eunit.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_view_map.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view_map.erl b/src/fabric_view_map.erl
index 4f6a3f1..b6fb5ce 100644
--- a/src/fabric_view_map.erl
+++ b/src/fabric_view_map.erl
@@ -16,7 +16,7 @@
-export([go/6]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/0aa7fa98/src/fabric_view_reduce.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view_reduce.erl b/src/fabric_view_reduce.erl
index a55e8cf..9f564f2 100644
--- a/src/fabric_view_reduce.erl
+++ b/src/fabric_view_reduce.erl
@@ -16,7 +16,7 @@
-export([go/6]).
--include("fabric.hrl").
+-include_lib("fabric/include/fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
-include_lib("couch/include/couch_db.hrl").