[couchdb] branch avoid-recompiling-js-for-view-filters created (now 6b2c1e662)

[va...@apache.org]

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

vatamane pushed a change to branch avoid-recompiling-js-for-view-filters
in repository https://gitbox.apache.org/repos/asf/couchdb.git


      at 6b2c1e662 Avoid re-compiling filter view functions

This branch includes the following new commits:

     new 6b2c1e662 Avoid re-compiling filter view functions

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb] 01/01: Avoid re-compiling filter view functions

[va...@apache.org]

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

vatamane pushed a commit to branch avoid-recompiling-js-for-view-filters
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 6b2c1e662c93dfd0193e3b6919360dd2970d2e21
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Mon Mar 13 12:46:57 2023 -0400

    Avoid re-compiling filter view functions
    
    Filter view functions feature re-uses view map function for filtering _changes
    feeds. Instead of accumulating emitted KVs, it uses custom emit() function
    which just toggles a flag. However, in order to use this optimisation, the
    function is compiled first with the regular emit function, then the function
    source is queried with a non-portable toSource() method, and re-compiled again
    with a new sandbox where emit is overridden.
    
    Instead of reparsing and re-compiling it, pass the sandbox to the compile
    function and compile filter views with that correct sandbox to start with.
    Moreover, this helps remove another non-portable function call.
---
 share/server/filter.js | 5 -----
 share/server/loop.js   | 5 ++++-
 share/server/util.js   | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/share/server/filter.js b/share/server/filter.js
index 84f5cfc09..e3a62ab26 100644
--- a/share/server/filter.js
+++ b/share/server/filter.js
@@ -28,11 +28,6 @@ var Filter = (function() {
         respond([true, results]);
       },
       filter_view : function(fun, ddoc, args) {
-        // recompile
-        var sandbox = create_filter_sandbox();
-        var source = fun.toSource();
-        fun = evalcx(source, sandbox);
-
         var results = [];
         var docs = args[0];
         for (var i=0; i < docs.length; i++) {
diff --git a/share/server/loop.js b/share/server/loop.js
index 91dd1d6b0..70a143a45 100644
--- a/share/server/loop.js
+++ b/share/server/loop.js
@@ -87,7 +87,10 @@ var DDoc = (function() {
                        " on design doc " + ddocId]);
               }
               if (typeof fun != "function") {
-                fun = Couch.compileFunction(fun, ddoc, funPath.join('.'));
+                // For filter_view we want the emit() function to be overridden
+                // and just toggle a flag instead of accumulating rows
+                var sandbox = (cmd === "views") ? create_filter_sandbox() : create_sandbox();
+                fun = Couch.compileFunction(fun, ddoc, funPath.join('.'), sandbox);
                 // cache the compiled fun on the ddoc
                 point[funPath[i]] = fun;
               };
diff --git a/share/server/util.js b/share/server/util.js
index aba56eaf2..c207d0ab9 100644
--- a/share/server/util.js
+++ b/share/server/util.js
@@ -58,11 +58,11 @@ var resolveModule = function(names, mod, root) {
 
 var Couch = {
   // moving this away from global so we can move to json2.js later
-  compileFunction : function(source, ddoc, name) {
+  compileFunction : function(source, ddoc, name, sandbox) {
     if (!source) throw(["error","not_found","missing function"]);
 
     var functionObject = null;
-    var sandbox = create_sandbox();
+    var sandbox = sandbox || create_sandbox();
 
     var require = function(name, module) {
       module = module || {};