Add limit to autocomplete generation

finos · Jan 30, 2021 · 7a33089 · 7a33089
1 parent 50ac870
commit 7a33089
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/cpp/perspective/src/cpp/arrow_csv.cpp b/cpp/perspective/src/cpp/arrow_csv.cpp
@@ -148,6 +148,7 @@ namespace apachearrow {
         arrow::TimestampParser::MakeStrptime("%m-%d-%Y"),
         arrow::TimestampParser::MakeStrptime("%m/%d/%Y"),
         arrow::TimestampParser::MakeStrptime("%d %m %Y"),
+        // TODO: time type column
         arrow::TimestampParser::MakeStrptime("%H:%M:%S.%f")};
 
     std::vector<std::shared_ptr<arrow::TimestampParser>> DATE_READERS{

diff --git a/packages/perspective-viewer/src/js/viewer/dom_element.js b/packages/perspective-viewer/src/js/viewer/dom_element.js
@@ -108,10 +108,22 @@ export class DomElement extends PerspectiveElement {
                     columns: [],
                     computed_columns: computed_names.includes(name) ? computed_columns : []
                 });
-                view.to_json().then(json => {
-                    row.choices(this._autocomplete_choices(json, type));
-                });
-                view.delete();
+
+                view.num_rows()
+                    .then(async nrows => {
+                        if (nrows < 100000) {
+                            // Autocomplete
+                            const json = await view.to_json({
+                                end_row: 10
+                            });
+                            row.choices(this._autocomplete_choices(json, type));
+                        } else {
+                            console.warn(`perspective-viewer did not generate autocompletion results - ${nrows} is greater than limit of 100,000 rows.`);
+                        }
+                    })
+                    .finally(() => {
+                        view.delete();
+                    });
             }
         }
 

diff --git a/packages/perspective-viewer/test/js/simple_tests.js b/packages/perspective-viewer/test/js/simple_tests.js
@@ -69,6 +69,7 @@ exports.default = function(method = "capture") {
         const viewer = await page.$("perspective-viewer");
         await page.shadow_click("perspective-viewer", "#config_button");
         await page.evaluate(element => element.setAttribute("filters", '[["Order Date", ">", "01/01/2012"]]'), viewer);
+        await page.waitForSelector("perspective-viewer:not([updating])");
     });
 
     test[method]("highlights invalid filter.", async page => {

diff --git a/python/perspective/perspective/tests/table/test_table_datetime.py b/python/perspective/perspective/tests/table/test_table_datetime.py
@@ -1076,7 +1076,7 @@ def test_table_row_pivot_datetime_row_path_local_time_EST(self):
         def test_table_row_pivot_datetime_row_path_UTC(self):
             """Make sure that string datetimes generated in Python are in
             UTC if the timezone is UTC.
-            
+
             Set the timezone before creating the table so that the local
             datetime is in the intended timezone, as this test asserts that
             paths in the same timezone are not edited to UTC."""

diff --git a/scripts/test_js.js b/scripts/test_js.js
@@ -7,7 +7,7 @@
  *
  */
 
-const {bash, execute, getarg, docker} = require("./script_utils.js");
+const {bash, execute, execute_throw, getarg, docker} = require("./script_utils.js");
 const fs = require("fs");
 
 const DEBUG_FLAG = getarg("--debug") ? "" : "--silent";
@@ -83,7 +83,6 @@ function jest_timezone() {
     return bash`
         node_modules/.bin/lerna exec 
         --concurrency 1 
-        --no-bail
         --scope="@finos/perspective" 
         -- 
         yarn test_timezone:run
@@ -115,18 +114,18 @@ try {
         if (getarg("--quiet")) {
             // Run all tests with suppressed output.
             console.log("-- Running test suite in quiet mode");
-            execute(silent(jest_timezone()));
+            execute_throw(silent(jest_timezone()));
             execute(silent(jest_all()));
         } else if (process.env.PACKAGE) {
             // Run tests for a single package.
             if (PACKAGE === "perspective") {
-                execute(jest_timezone());
+                execute_throw(jest_timezone());
             }
             execute(jest_single());
         } else {
             // Run all tests with full output.
             console.log("-- Running test suite in fast mode");
-            execute(jest_timezone());
+            execute_throw(jest_timezone());
             execute(jest_all());
         }
     }