couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kocol...@apache.org
Subject git commit: Remove Style where we have no need for it
Date Mon, 22 Aug 2011 14:45:20 GMT
Updated Branches:
  refs/heads/1256-changes-skips-revisions 25843313b -> cf643e2ca


Remove Style where we have no need for it


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

Branch: refs/heads/1256-changes-skips-revisions
Commit: cf643e2ca787f231d9d313eb4707b5b21b48b6d9
Parents: 2584331
Author: Adam Kocoloski <kocolosk@apache.org>
Authored: Mon Aug 22 10:37:44 2011 -0400
Committer: Adam Kocoloski <kocolosk@apache.org>
Committed: Mon Aug 22 10:40:14 2011 -0400

----------------------------------------------------------------------
 src/couchdb/couch_changes.erl |    2 --
 src/couchdb/couch_db.erl      |    8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/cf643e2c/src/couchdb/couch_changes.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_changes.erl b/src/couchdb/couch_changes.erl
index eb59bd7..fc2d585 100644
--- a/src/couchdb/couch_changes.erl
+++ b/src/couchdb/couch_changes.erl
@@ -246,7 +246,6 @@ start_sending_changes(Callback, UserAcc, ResponseType) ->
 
 send_changes(Args, Callback, UserAcc, Db, StartSeq, Prepend) ->
     #changes_args{
-        style = Style,
         include_docs = IncludeDocs,
         conflicts = Conflicts,
         limit = Limit,
@@ -256,7 +255,6 @@ send_changes(Args, Callback, UserAcc, Db, StartSeq, Prepend) ->
     } = Args,
     couch_db:changes_since(
         Db,
-        Style,
         StartSeq,
         fun changes_enumerator/2,
         [{dir, Dir}],

http://git-wip-us.apache.org/repos/asf/couchdb/blob/cf643e2c/src/couchdb/couch_db.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl
index 768054b..325db94 100644
--- a/src/couchdb/couch_db.erl
+++ b/src/couchdb/couch_db.erl
@@ -26,7 +26,7 @@
 -export([start_link/3,open_doc_int/3,ensure_full_commit/1]).
 -export([set_security/2,get_security/1]).
 -export([init/1,terminate/2,handle_call/3,handle_cast/2,code_change/3,handle_info/2]).
--export([changes_since/5,changes_since/6,read_doc/2,new_revid/1]).
+-export([changes_since/4,changes_since/5,read_doc/2,new_revid/1]).
 -export([check_is_admin/1, check_is_member/1]).
 -export([reopen/1]).
 
@@ -1023,10 +1023,10 @@ enum_docs_reduce_to_count(Reds) ->
             fun couch_db_updater:btree_by_id_reduce/2, Reds),
     element(1, FinalRed).
 
-changes_since(Db, Style, StartSeq, Fun, Acc) ->
-    changes_since(Db, Style, StartSeq, Fun, [], Acc).
+changes_since(Db, StartSeq, Fun, Acc) ->
+    changes_since(Db, StartSeq, Fun, [], Acc).
     
-changes_since(Db, _Style, StartSeq, Fun, Options, Acc) ->
+changes_since(Db, StartSeq, Fun, Options, Acc) ->
     Wrapper = fun(DocInfo, _Offset, Acc2) -> Fun(DocInfo, Acc2) end,
     {ok, _LastReduction, AccOut} = couch_btree:fold(by_seq_btree(Db),
         Wrapper, Acc, [{start_key, StartSeq + 1}] ++ Options),


Mime
View raw message