This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch access
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/access by this push:
new a10b81b fix global_changes
a10b81b is described below
commit a10b81b8da68f43e61fd9cec34ddd8ad69448ce4
Author: Jan Lehnardt <[email protected]>
AuthorDate: Fri Jul 19 20:54:50 2019 +0200
fix global_changes
---
rel/overlay/etc/default.ini | 2 +-
src/couch/src/couch_access_native_proc.erl | 2 +-
src/couch/src/couch_db.erl | 6 +-
src/couch/src/couch_db_updater.erl | 1 -
src/couch_index/src/couch_index_updater.erl | 1 -
src/fabric/src/fabric_rpc.erl | 2 -
src/global_changes/src/global_changes_server.erl | 2 +-
t.sh | 70 ++++++++++++++----------
8 files changed, 46 insertions(+), 40 deletions(-)
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index e8df095..3e2e877 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -505,7 +505,7 @@ _default = [{db_fragmentation, "70%"}, {view_fragmentation,
"60%"}]
; emergency, emerg
; none
;
-level = debug
+level = info
;
; Set the maximum log message length in bytes that will be
; passed through the writer
diff --git a/src/couch/src/couch_access_native_proc.erl
b/src/couch/src/couch_access_native_proc.erl
index aabdfb5..357fae1 100644
--- a/src/couch/src/couch_access_native_proc.erl
+++ b/src/couch/src/couch_access_native_proc.erl
@@ -145,6 +145,6 @@ map_doc(_St, {Doc}) ->
[[UserOrRole, Seq], [{rev, Rev}, {deleted, Deleted}, {body_sp,
BodySp}]]
] end, Access),
ById ++ BySeq;
- _Else ->
+ Else ->
[[],[]] % no comprende: should not be needed once we implement
_access field validation
end.
diff --git a/src/couch/src/couch_db.erl b/src/couch/src/couch_db.erl
index 410dd70..52975fd 100644
--- a/src/couch/src/couch_db.erl
+++ b/src/couch/src/couch_db.erl
@@ -1740,18 +1740,18 @@ open_doc_int(Db, <<?LOCAL_DOC_PREFIX, _/binary>> = Id,
Options) ->
{not_found, missing}
end;
open_doc_int(Db, #doc_info{id=Id,revs=[RevInfo|_],access=Access}=DocInfo,
Options) ->
- couch_log:info(">>> open_doc_int 2, DocInfo: ~p", [DocInfo]),
+% couch_log:info(">>> open_doc_int 2, DocInfo: ~p", [DocInfo]),
#rev_info{deleted=IsDeleted,rev={Pos,RevId},body_sp=Bp} = RevInfo,
Doc = make_doc(Db, Id, IsDeleted, Bp, {Pos,[RevId]}, Access),
apply_open_options(Db,
{ok, Doc#doc{meta=doc_meta_info(DocInfo, [], Options)}}, Options);
open_doc_int(Db,
#full_doc_info{id=Id,rev_tree=RevTree,access=Access}=FullDocInfo, Options) ->
- couch_log:info(">>> open_doc_int 3, FDI: ~p, Access: ~p", [FullDocInfo,
Access]),
+% couch_log:info(">>> open_doc_int 3, FDI: ~p, Access: ~p", [FullDocInfo,
Access]),
#doc_info{revs=[#rev_info{deleted=IsDeleted,rev=Rev,body_sp=Bp}|_]} =
DocInfo = couch_doc:to_doc_info(FullDocInfo),
{[{_, RevPath}], []} = couch_key_tree:get(RevTree, [Rev]),
Doc = make_doc(Db, Id, IsDeleted, Bp, RevPath, Access),
- couch_log:info(">>> ***** open_doc_int 3 made that doc: ~p", [Doc]),
+% couch_log:info(">>> ***** open_doc_int 3 made that doc: ~p", [Doc]),
apply_open_options(Db,
{ok, Doc#doc{meta=doc_meta_info(DocInfo, RevTree, Options)}}, Options);
open_doc_int(Db, Id, Options) ->
diff --git a/src/couch/src/couch_db_updater.erl
b/src/couch/src/couch_db_updater.erl
index f671c82..ff6d366 100644
--- a/src/couch/src/couch_db_updater.erl
+++ b/src/couch/src/couch_db_updater.erl
@@ -255,7 +255,6 @@ code_change(_OldVsn, State, _Extra) ->
{ok, State}.
sort_and_tag_grouped_docs(Client, GroupedDocs) ->
- % couch_log:info("~nBERTBERTBERTBERTBERTBERTBERTBERTBERT: GroupedDocs:
~p", [GroupedDocs]),
% These groups should already be sorted but sometimes clients misbehave.
% The merge_updates function will fail and the database can end up with
% duplicate documents if the incoming groups are not sorted, so as a sanity
diff --git a/src/couch_index/src/couch_index_updater.erl
b/src/couch_index/src/couch_index_updater.erl
index e2bf1f6..ebfeb11 100644
--- a/src/couch_index/src/couch_index_updater.erl
+++ b/src/couch_index/src/couch_index_updater.erl
@@ -159,7 +159,6 @@ update(Idx, Mod, IdxState) ->
end,
LoadDoc = fun(DI) ->
-
{DocId, Seq, Deleted, DocInfo, Access} = GetInfo(DI),
case {IncludeDesign, DocId} of
diff --git a/src/fabric/src/fabric_rpc.erl b/src/fabric/src/fabric_rpc.erl
index fd1d170..2b00a36 100644
--- a/src/fabric/src/fabric_rpc.erl
+++ b/src/fabric/src/fabric_rpc.erl
@@ -503,7 +503,6 @@ changes_enumerator(#full_doc_info{} = FDI, Acc) ->
changes_enumerator(#doc_info{id= <<"_local/", _/binary>>, high_seq=Seq}, Acc)
->
{ok, Acc#fabric_changes_acc{seq = Seq, pending =
Acc#fabric_changes_acc.pending-1}};
changes_enumerator(DocInfo, Acc) ->
- couch_log:info("~n@@@@@@@@@@@ fabric_rpc:changes_enumerator() DocInfo:
~p~n", [DocInfo]),
#fabric_changes_acc{
db = Db,
args = #changes_args{
@@ -536,7 +535,6 @@ changes_enumerator(DocInfo, Acc) ->
{ok, Acc#fabric_changes_acc{seq = Seq, pending = Pending-1}}.
doc_member(Shard, DocInfo, Opts, Filter) ->
- couch_log:info("~n^^^^^^^^^^^^^^^^^^^^^ fabric_rpc:doc_member() DocInfo:
~p~n", [DocInfo]),
case couch_db:open_doc(Shard, DocInfo, [deleted | Opts]) of
{ok, Doc} ->
{doc, maybe_filtered_json_doc(Doc, Opts, Filter)};
diff --git a/src/global_changes/src/global_changes_server.erl
b/src/global_changes/src/global_changes_server.erl
index 7e30625..d0783be 100644
--- a/src/global_changes/src/global_changes_server.erl
+++ b/src/global_changes/src/global_changes_server.erl
@@ -160,7 +160,7 @@ flush_updates(State) ->
end, [], GroupedIds),
spawn(fun() ->
- fabric:update_docs(State#state.dbname, Docs, [])
+ fabric:update_docs(State#state.dbname, Docs, [?ADMIN_CTX])
end),
Count = State#state.pending_update_count,
diff --git a/t.sh b/t.sh
index 8b89269..741a10a 100755
--- a/t.sh
+++ b/t.sh
@@ -6,11 +6,21 @@ YDB=http://y:[email protected]:15984
curl -sX PUT $DB/_users/org.couchdb.user:x -d @user.json > /dev/null #
curl -sX PUT $DB/_users/org.couchdb.user:y -d @user2.json > /dev/null #
+# curl -sX DELETE $DB/_global_changes
curl -sX DELETE $DB/db
curl -sX PUT $DB/db?q=1'&access=true'
-##############
+
+curl -sX DELETE $DB/db2
+curl -sX PUT $DB/db2
+
+# ##############
curl -sX PUT $DB/db/a -d '{"a":1,"_access":["x"]}'
curl -s $DB/db/a
+
+curl -sX PUT $DB/db2/a -d '{"a":1,"_access":["x"]}'
+curl -s $DB/db2/a
+
+
curl -s $XDB/db/a
curl -s $YDB/db/a
#
@@ -35,33 +45,33 @@ curl -s $DB/db/_changes?include_docs=true
curl -s $XDB/db/_changes?include_docs=true
curl -s $YDB/db/_changes?include_docs=true
# # #
-# curl -s $DB/db/a
-# curl -s $DB/db/b
-# curl -s $DB/db/c
-# curl -s $DB/db/d
-#
-# curl -s $XDB/db/a
-# curl -s $XDB/db/b
-# curl -s $XDB/db/c
-# curl -s $XDB/db/d
-#
-# curl -s $YDB/db/a
-# curl -s $YDB/db/b
-# curl -s $YDB/db/c
-# curl -s $YDB/db/d
-# #
-# curl -sX PUT $XDB/db/b?rev="1-809cfddb59a4f02dc1009785fad978b4" -d
'{"b":5,"_access":["x"]}'
-# curl -sX PUT $XDB/db/c?rev="1-0865d643568aa9be6bcdc15d88b25912" -d
'{"c":6,"_access":["y"]}'
-# curl -sX PUT $XDB/db/d?rev="1-87adddda059e643409c43bea87c37bfe" -d
'{"d":7,"_access":["y"]}'
-#
-# curl -sX PUT $YDB/db/b?rev="1-809cfddb59a4f02dc1009785fad978b4" -d
'{"b":5,"_access":["x"]}'
-# curl -sX PUT $YDB/db/c?rev="1-0865d643568aa9be6bcdc15d88b25912" -d
'{"c":6,"_access":["y"]}'
-# curl -sX PUT $YDB/db/d?rev="1-87adddda059e643409c43bea87c37bfe" -d
'{"d":7,"_access":["y"]}'
-#
-# curl -sX DELETE $XDB/db/b?rev="2-384262a5168d1187dff405530046666"
-# curl -sX DELETE $XDB/db/c?rev="2-4cdae6f0a7539ea92dc79f3d3b0379b"
-# curl -sX DELETE $XDB/db/d?rev="2-868c18641965cfae831be1114b49a66b"
+curl -s $DB/db/a
+curl -s $DB/db/b
+curl -s $DB/db/c
+curl -s $DB/db/d
+
+curl -s $XDB/db/a
+curl -s $XDB/db/b
+curl -s $XDB/db/c
+curl -s $XDB/db/d
+
+curl -s $YDB/db/a
+curl -s $YDB/db/b
+curl -s $YDB/db/c
+curl -s $YDB/db/d
#
-# curl -sX DELETE $YDB/db/b?rev="2-384262a5168d1187dff405530046666"
-# curl -sX DELETE $YDB/db/c?rev="2-4cdae6f0a7539ea92dc79f3d3b0379b"
-# curl -sX DELETE $YDB/db/d?rev="2-868c18641965cfae831be1114b49a66b"
+curl -sX PUT $XDB/db/b?rev="1-967a00dff5e02add41819138abb3284d" -d
'{"b":5,"_access":["x"]}'
+curl -sX PUT $XDB/db/c?rev="1-0865d643568aa9be6bcdc15d88b25912" -d
'{"c":6,"_access":["y"]}'
+curl -sX PUT $XDB/db/d?rev="1-87adddda059e643409c43bea87c37bfe" -d
'{"d":7,"_access":["y"]}'
+
+curl -sX PUT $YDB/db/b?rev="1-809cfddb59a4f02dc1009785fad978b4" -d
'{"b":5,"_access":["x"]}'
+curl -sX PUT $YDB/db/c?rev="1-0865d643568aa9be6bcdc15d88b25912" -d
'{"c":6,"_access":["y"]}'
+curl -sX PUT $YDB/db/d?rev="1-87adddda059e643409c43bea87c37bfe" -d
'{"d":7,"_access":["y"]}'
+
+curl -sX DELETE $XDB/db/b?rev="2-384262a5168d1187dff405530046666"
+curl -sX DELETE $XDB/db/c?rev="2-4cdae6f0a7539ea92dc79f3d3b0379b"
+curl -sX DELETE $XDB/db/d?rev="2-868c18641965cfae831be1114b49a66b"
+
+curl -sX DELETE $YDB/db/b?rev="2-384262a5168d1187dff405530046666"
+curl -sX DELETE $YDB/db/c?rev="2-4cdae6f0a7539ea92dc79f3d3b0379b"
+curl -sX DELETE $YDB/db/d?rev="2-868c18641965cfae831be1114b49a66b"
