You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2021/04/16 21:45:20 UTC

[couchdb] 15/24: Clean up couch_db.hrl

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 7b83445139a6dc8c4b953a1c5879d8cb8b025fea
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Wed Apr 14 01:58:18 2021 -0400

    Clean up couch_db.hrl
    
    Un-used defines and records are removed
---
 src/chttpd/src/chttpd_changes.erl |  4 +---
 src/couch/include/couch_db.hrl    | 44 ---------------------------------------
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/src/chttpd/src/chttpd_changes.erl b/src/chttpd/src/chttpd_changes.erl
index 8bf33ec..fcaee92 100644
--- a/src/chttpd/src/chttpd_changes.erl
+++ b/src/chttpd/src/chttpd_changes.erl
@@ -530,9 +530,7 @@ send_lookup_changes(FullDocInfos, StartSeq, Dir, Db, Fun, Acc0) ->
         fwd ->
             FinalAcc0 = case element(1, FinalAcc) of
                 changes_acc -> % we came here via couch_http or internal call
-                    FinalAcc#changes_acc{seq = fabric2_db:get_update_seq(Db)};
-                fabric_changes_acc -> % we came here via chttpd / fabric / rexi
-                    FinalAcc#fabric_changes_acc{seq = couch_db:get_update_seq(Db)}
+                    FinalAcc#changes_acc{seq = fabric2_db:get_update_seq(Db)}
             end,
             {ok, FinalAcc0};
         rev -> {ok, FinalAcc}
diff --git a/src/couch/include/couch_db.hrl b/src/couch/include/couch_db.hrl
index cc1fb5d..2289089 100644
--- a/src/couch/include/couch_db.hrl
+++ b/src/couch/include/couch_db.hrl
@@ -13,18 +13,13 @@
 -define(LOCAL_DOC_PREFIX, "_local/").
 -define(DESIGN_DOC_PREFIX0, "_design").
 -define(DESIGN_DOC_PREFIX, "_design/").
--define(DEFAULT_COMPRESSION, snappy).
 
 -define(MIN_STR, <<"">>).
 -define(MAX_STR, <<255>>). % illegal utf string
 
--define(REWRITE_COUNT, couch_rewrite_count).
-
 -define(JSON_ENCODE(V), couch_util:json_encode(V)).
 -define(JSON_DECODE(V), couch_util:json_decode(V)).
 
--define(IS_OLD_RECORD(V, R), (tuple_size(V) /= tuple_size(R))).
-
 -define(b2l(V), binary_to_list(V)).
 -define(l2b(V), list_to_binary(V)).
 -define(i2b(V), couch_util:integer_to_boolean(V)).
@@ -39,7 +34,6 @@
 
 -define(SYSTEM_DATABASES, [
     <<"_dbs">>,
-    <<"_global_changes">>,
     <<"_metadata">>,
     <<"_nodes">>,
     <<"_replicator">>,
@@ -128,18 +122,6 @@
     handler
 }).
 
--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,
@@ -149,13 +131,6 @@
     json = nil
 }).
 
--record(index_header, {
-    seq=0,
-    purge_seq=0,
-    id_btree_state=nil,
-    view_states=nil
-}).
-
 % small value used in revision trees to indicate the revision isn't stored
 -define(REV_MISSING, []).
 
@@ -176,16 +151,6 @@
     db_open_options = []
 }).
 
--record(btree, {
-    fd,
-    root,
-    extract_kv,
-    assemble_kv,
-    less,
-    reduce = nil,
-    compression = ?DEFAULT_COMPRESSION
-}).
-
 -record(proc, {
     pid,
     lang,
@@ -204,15 +169,6 @@
     atts = []
 }).
 
--record (fabric_changes_acc, {
-    db,
-    seq,
-    args,
-    options,
-    pending,
-    epochs
-}).
-
 -type doc() :: #doc{}.
 -type ddoc() :: #doc{}.
 -type user_ctx() :: #user_ctx{}.