couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vatam...@apache.org
Subject [24/50] couch-replicator commit: updated refs/heads/63012-scheduler to 27a5eae
Date Tue, 14 Mar 2017 19:26:19 GMT
Fix indentation


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/849ca9b4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/849ca9b4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/849ca9b4

Branch: refs/heads/63012-scheduler
Commit: 849ca9b49f2b4d5665a8a5e6764a9269b2ba36fc
Parents: 36367d0
Author: Nick Vatamaniuc <vatamane@apache.org>
Authored: Wed Nov 9 17:44:02 2016 -0500
Committer: Nick Vatamaniuc <vatamane@apache.org>
Committed: Wed Nov 9 17:44:02 2016 -0500

----------------------------------------------------------------------
 src/couch_replicator_api_wrap.erl      | 28 ++++++++++++++--------------
 src/couch_replicator_doc_processor.erl | 14 +++++++-------
 src/couch_replicator_docs.erl          | 18 +++++++++---------
 3 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/849ca9b4/src/couch_replicator_api_wrap.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_api_wrap.erl b/src/couch_replicator_api_wrap.erl
index 7828684..a0d08d7 100644
--- a/src/couch_replicator_api_wrap.erl
+++ b/src/couch_replicator_api_wrap.erl
@@ -996,13 +996,13 @@ header_value(Key, Headers, Default) ->
 % comparisons. This means remove things like pids and also sort options / props.
 normalize_db(#httpdb{} = HttpDb) ->
     #httpdb{
-       url = HttpDb#httpdb.url,
-       oauth = HttpDb#httpdb.oauth,
-       headers = lists:keysort(1, HttpDb#httpdb.headers),
-       timeout = HttpDb#httpdb.timeout,
-       ibrowse_options = lists:keysort(1, HttpDb#httpdb.ibrowse_options),
-       retries = HttpDb#httpdb.retries,
-       http_connections = HttpDb#httpdb.http_connections
+        url = HttpDb#httpdb.url,
+        oauth = HttpDb#httpdb.oauth,
+        headers = lists:keysort(1, HttpDb#httpdb.headers),
+        timeout = HttpDb#httpdb.timeout,
+        ibrowse_options = lists:keysort(1, HttpDb#httpdb.ibrowse_options),
+        retries = HttpDb#httpdb.retries,
+        http_connections = HttpDb#httpdb.http_connections
     };
 
 normalize_db(<<DbName/binary>>) ->
@@ -1016,13 +1016,13 @@ normalize_db(<<DbName/binary>>) ->
 
 normalize_http_db_test() ->
     HttpDb =  #httpdb{
-       url = "http://host/db",
-       oauth = #oauth{},
-       headers = [{"k2","v2"}, {"k1","v1"}],
-       timeout = 30000,
-       ibrowse_options = [{k2, v2}, {k1, v1}],
-       retries = 10,
-       http_connections = 20
+        url = "http://host/db",
+        oauth = #oauth{},
+        headers = [{"k2","v2"}, {"k1","v1"}],
+        timeout = 30000,
+        ibrowse_options = [{k2, v2}, {k1, v1}],
+        retries = 10,
+        http_connections = 20
     },
     Expected = HttpDb#httpdb{
         headers = [{"k1","v1"}, {"k2","v2"}],

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/849ca9b4/src/couch_replicator_doc_processor.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_doc_processor.erl b/src/couch_replicator_doc_processor.erl
index 8ee1fe7..917d8c9 100644
--- a/src/couch_replicator_doc_processor.erl
+++ b/src/couch_replicator_doc_processor.erl
@@ -266,13 +266,13 @@ normalize_rep(nil) ->
 
 normalize_rep(#rep{} = Rep)->
     #rep{
-       source = couch_replicator_api_wrap:normalize_db(Rep#rep.source),
-       target = couch_replicator_api_wrap:normalize_db(Rep#rep.target),
-       options = Rep#rep.options,  % already sorted in make_options/1
-       type = Rep#rep.type,
-       view = Rep#rep.view,
-       doc_id = Rep#rep.doc_id,
-       db_name = Rep#rep.db_name
+        source = couch_replicator_api_wrap:normalize_db(Rep#rep.source),
+        target = couch_replicator_api_wrap:normalize_db(Rep#rep.target),
+        options = Rep#rep.options,  % already sorted in make_options/1
+        type = Rep#rep.type,
+        view = Rep#rep.view,
+        doc_id = Rep#rep.doc_id,
+        db_name = Rep#rep.db_name
     }.
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/849ca9b4/src/couch_replicator_docs.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_docs.erl b/src/couch_replicator_docs.erl
index fb417e4..07344bb 100644
--- a/src/couch_replicator_docs.erl
+++ b/src/couch_replicator_docs.erl
@@ -96,11 +96,11 @@ update_triggered(Rep, {Base, Ext}) ->
     } = Rep,
     StartTimeBin = couch_replicator_utils:iso8601(StartTime),
     update_rep_doc(DbName, DocId, [
-            {<<"_replication_state">>, <<"triggered">>},
-            {<<"_replication_state_reason">>, undefined},
-            {<<"_replication_id">>, iolist_to_binary([Base, Ext])},
-            {<<"_replication_start_time">>, StartTimeBin},
-            {<<"_replication_stats">>, undefined}]),
+        {<<"_replication_state">>, <<"triggered">>},
+        {<<"_replication_state_reason">>, undefined},
+        {<<"_replication_id">>, iolist_to_binary([Base, Ext])},
+        {<<"_replication_start_time">>, StartTimeBin},
+        {<<"_replication_stats">>, undefined}]),
     ok.
 
 
@@ -114,10 +114,10 @@ update_error(#rep{db_name = DbName, doc_id = DocId, id = RepId}, Error)
->
             null
     end,
     update_rep_doc(DbName, DocId, [
-            {<<"_replication_state">>, <<"error">>},
-            {<<"_replication_state_reason">>, Reason},
-            {<<"_replication_stats">>, undefined},
-            {<<"_replication_id">>, BinRepId}]),
+        {<<"_replication_state">>, <<"error">>},
+        {<<"_replication_state_reason">>, Reason},
+        {<<"_replication_stats">>, undefined},
+        {<<"_replication_id">>, BinRepId}]),
     ok.
 
 


Mime
View raw message