summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2020-11-10 11:52:17 -0600
committerPaul J. Davis <paul.joseph.davis@gmail.com>2020-11-10 14:09:32 -0600
commit7d3caa97b18a8bd953c96b39c9a986a4a11e5f34 (patch)
tree2e8b24f0165495eeeabe03787053cde4f4d3df08
parent8267950dc8055b883e599cd993e688de1cec3ab4 (diff)
downloadcouchdb-7d3caa97b18a8bd953c96b39c9a986a4a11e5f34.tar.gz
Remove use of caching
Turns out that ebtree caching wasn't quite correct so removing it for now.
-rw-r--r--src/couch_views/src/couch_views_trees.erl28
1 files changed, 1 insertions, 27 deletions
diff --git a/src/couch_views/src/couch_views_trees.erl b/src/couch_views/src/couch_views_trees.erl
index 236e89fdb..51c1e46cf 100644
--- a/src/couch_views/src/couch_views_trees.erl
+++ b/src/couch_views/src/couch_views_trees.erl
@@ -229,7 +229,6 @@ open_id_tree(TxDb, Sig) ->
Prefix = id_tree_prefix(DbPrefix, Sig),
TreeOpts = [
{persist_fun, fun couch_views_fdb:persist_chunks/3},
- {cache_fun, create_cache_fun(id_tree)},
{encode_fun, create_encode_fun(TxDb)}
],
ebtree:open(Tx, Prefix, get_order(id_btree), TreeOpts).
@@ -255,8 +254,7 @@ open_view_tree(TxDb, Sig, Lang, View, Options) ->
[{reduce_fun, RedFun}];
false ->
[
- {reduce_fun, make_reduce_fun(Lang, View)},
- {cache_fun, create_cache_fun({view, ViewId})}
+ {reduce_fun, make_reduce_fun(Lang, View)}
]
end,
TreeOpts = BaseOpts ++ ExtraOpts,
@@ -333,30 +331,6 @@ make_reduce_fun(Lang, #mrview{} = View) ->
end.
-create_cache_fun(TreeId) ->
- CacheTid = case get(TreeId) of
- undefined ->
- Tid = ets:new(?MODULE, [protected, set]),
- put(TreeId, {ebtree_cache, Tid}),
- Tid;
- {ebtree_cache, Tid} ->
- Tid
- end,
- fun
- (set, [Id, Node]) ->
- true = ets:insert_new(CacheTid, {Id, Node}),
- ok;
- (clear, Id) ->
- ets:delete(CacheTid, Id),
- ok;
- (get, Id) ->
- case ets:lookup(CacheTid, Id) of
- [{Id, Node}] -> Node;
- [] -> undefined
- end
- end.
-
-
create_encode_fun(TxDb) ->
fun
(encode, Key, Term) ->