Merge pull request #1567 from finos/fix-server-mode

Fix #1566, remove deprecated flags from WASM debug build
finos · Oct 6, 2021 · d60f62a · d60f62a
2 parents e02b7d6 + d716a6a
commit d60f62a
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 11 deletions.
diff --git a/cpp/perspective/CMakeLists.txt b/cpp/perspective/CMakeLists.txt
@@ -232,9 +232,9 @@ if (PSP_WASM_BUILD)
 	if(CMAKE_BUILD_TYPE_LOWER STREQUAL debug)
 		set(OPT_FLAGS " \
 			-O0 \
-			-g4 \
+			-g3 \
+			-gsource-map \
 			--profiling \
-			-s WARN_UNALIGNED=1 \
 			-Wcast-align \
 			-Wover-aligned \
 			")

diff --git a/packages/perspective/test/js/expressions/functionality.js b/packages/perspective/test/js/expressions/functionality.js
@@ -2614,6 +2614,26 @@ module.exports = (perspective) => {
                     'max(100, "a")': "float",
                     "more columns": "string",
                 });
+
+                let i = 0;
+                for (const alias of [
+                    "abc",
+                    "def",
+                    expressions[2],
+                    "new column",
+                    expressions[4],
+                    expressions[5],
+                    "more columns",
+                    expressions[7],
+                    expressions[8],
+                    expressions[9],
+                    expressions[10],
+                ]) {
+                    expect(results.expression_alias[alias]).toEqual(
+                        expressions[i]
+                    );
+                    i++;
+                }
                 table.delete();
             });
 
@@ -2638,6 +2658,7 @@ module.exports = (perspective) => {
                     'max(100, "a")', // valid
                 ];
                 const results = await table.validate_expressions(expressions);
+
                 expect(results.expression_schema).toEqual({
                     '"a" + "d"': "float",
                     '"c"': "string",
@@ -2646,6 +2667,11 @@ module.exports = (perspective) => {
                     'max(100, "a")': "float",
                     "concat(\"c\", ' ', \"c\", 'abc')": "string",
                 });
+
+                for (const expr of expressions) {
+                    expect(results.expression_alias[expr]).toEqual(expr);
+                }
+
                 table.delete();
             });
 
@@ -2672,6 +2698,11 @@ module.exports = (perspective) => {
                     "bucket(\"b\", 'M')": "date",
                     'upper("c")': "string",
                 });
+
+                for (const expr of expressions) {
+                    expect(results.expression_alias[expr]).toEqual(expr);
+                }
+
                 table.delete();
             });
 

diff --git a/python/perspective/perspective/table/table.py b/python/perspective/perspective/table/table.py
@@ -185,7 +185,7 @@ def validate_expressions(self, expressions, as_string=False):
             as_string (:obj:`bool`): If True, returns the data types as string
                 representations so they can be serialized.
         """
-        validated = {"expression_schema": {}, "errors": {}}
+        validated = {"expression_schema": {}, "errors": {}, "expression_alias": {}}
 
         if len(expressions) == 0:
             return validated
@@ -195,9 +195,15 @@ def validate_expressions(self, expressions, as_string=False):
         expression_schema = validation_results.get_expression_schema()
         expression_errors = validation_results.get_expression_errors()
 
+        for expression in expressions:
+            # expression_alias can be used to map the alias to the
+            # full expression string in the UI.
+            validated["expression_alias"][expression[0]] = expression[1]
+
         for (alias, dtype) in iteritems(expression_schema):
             if not as_string:
                 dtype = _str_to_pythontype(dtype)
+
             validated["expression_schema"][alias] = expression_schema[alias]
 
         for (alias, error) in iteritems(expression_errors):

diff --git a/python/perspective/perspective/tests/manager/test_manager.py b/python/perspective/perspective/tests/manager/test_manager.py
@@ -332,7 +332,10 @@ def test_manager_table_validate_expressions(self):
                 "expression_schema": {
                     "abc": "float"
                 },
-                "errors": {}
+                "errors": {},
+                "expression_alias": {
+                    "abc": '// abc \n "a" + "a"'
+                }
             }
         })
 

diff --git a/python/perspective/perspective/tests/table/test_view_expression.py b/python/perspective/perspective/tests/table/test_view_expression.py
@@ -19,6 +19,7 @@ def test_table_validate_expressions_empty(self):
         table = Table({"a": [1, 2, 3, 4], "b": [5, 6, 7, 8]})
         validate = table.validate_expressions([])
         assert validate["expression_schema"] == {}
+        assert validate["expression_alias"] == {}
         assert validate["errors"] == {}
 
     def test_view_expression_schema_empty(self):
@@ -27,18 +28,61 @@ def test_view_expression_schema_empty(self):
         assert view.to_columns() == {"a": [1, 2, 3, 4], "b": [5, 6, 7, 8]}
         assert view.expression_schema() == {}
 
+    def test_view_validate_expressions_alias_map_errors(self):
+        table = Table({"a": [1, 2, 3, 4], "b": [5, 6, 7, 8]})
+        expressions = [
+            '// x\n"a"',
+            '// y\n"b" * 0.5',
+            "// c\n'abcdefg'",
+            "// d\ntrue and false",
+            '// e\nfloat("a") > 2 ? null : 1',
+            "// f\ntoday()",
+            "// g\nnow()",
+            "// h\nlength(123)",
+        ]
+
+        validated = table.validate_expressions(expressions)
+
+        aliases = ["x", "y", "c", "d", "e", "f", "g", "h"]
+
+        # Errored should also be in aliases
+        for idx, alias in enumerate(aliases):
+            assert validated["expression_alias"][alias] == expressions[idx]
+
+    def test_view_validate_expressions_alias_map(self):
+        table = Table({"a": [1, 2, 3, 4], "b": [5, 6, 7, 8]})
+        expressions = [
+            '// x\n"a"',
+            '// y\n"b" * 0.5',
+            "// c\n'abcdefg'",
+            "// d\ntrue and false",
+            '// e\nfloat("a") > 2 ? null : 1',
+            "// f\ntoday()",
+            "// g\nnow()",
+            "// h\nlength('abcd')",
+        ]
+
+        validated = table.validate_expressions(expressions)
+
+        aliases = ["x", "y", "c", "d", "e", "f", "g", "h"]
+
+        for idx, alias in enumerate(aliases):
+            assert validated["expression_alias"][alias] == expressions[idx]
+
     def test_view_expression_schema_all_types(self):
         table = Table({"a": [1, 2, 3, 4], "b": [5, 6, 7, 8]})
-        view = table.view(expressions=[
+        expressions = [
             '"a"',
             '"b" * 0.5',
             "'abcdefg'",
             "true and false",
             'float("a") > 2 ? null : 1',
             "today()",
             "now()",
-            "length('abcd')"
-        ])
+            "length('abcd')",
+        ]
+
+        view = table.view(expressions=expressions)
         assert view.expression_schema() == {
             '"a"': int,
             '"b" * 0.5': float,
@@ -47,12 +91,13 @@ def test_view_expression_schema_all_types(self):
             'float("a") > 2 ? null : 1': float,
             "today()": date,
             "now()": datetime,
-            "length('abcd')": float
+            "length('abcd')": float,
         }
 
         result = view.to_columns()
         today = datetime(date.today().year, date.today().month, date.today().day)
         del result["now()"]  # no need to match datetime.now()
+
         assert result == {
             "a": [1, 2, 3, 4],
             "b": [5, 6, 7, 8],
@@ -65,12 +110,17 @@ def test_view_expression_schema_all_types(self):
             "length('abcd')": [4 for _ in range(4)]
         }
 
+        validated = table.validate_expressions(expressions)
+
+        for expr in expressions:
+            assert validated["expression_alias"][expr] == expr
+
     def test_table_validate_expressions_with_errors(self):
         table = Table({"a": [1, 2, 3, 4], "b": [5, 6, 7, 8]})
-        validate = table.validate_expressions(
-            ['"Sales" + "Profit"', "datetime()", "string()", "for () {}"]
-        )
+        expressions = ['"Sales" + "Profit"', "datetime()", "string()", "for () {}"]
+        validate = table.validate_expressions(expressions)
         assert validate["expression_schema"] == {}
+        assert validate["expression_alias"] == {expr: expr for expr in expressions}
         assert validate["errors"] == {
             '"Sales" + "Profit"': {
                 "column": 0,