Done getting the results

Author: dx-tang

.gitignore

@@ -21,3 +21,6 @@ dask-worker-space/
 .ipynb
 # large spreadsheet
 *10M.csv
+
+#temp files
+~$*

forms/executor/dbexecutor/dbexecutor.py

@@ -84,7 +84,9 @@ def execute_formula_plan(self, formula_plan: PlanNode) -> pd.DataFrame:
                 exec_subtree = scheduler.next_subtree()
                 is_root_subtree = not scheduler.has_next_subtree()
                 intermediate_table_name = (
-                    exec_subtree.intermediate_table_name if isinstance(exec_subtree, DBFuncExecNode) else ""
+                    exec_subtree.intermediate_table_name
+                    if isinstance(exec_subtree, DBFuncExecNode)
+                    else ""
                 )
                 start_time = time.time()
                 sql_composable = translate(

forms/executor/dbexecutor/scheduler.py

@@ -25,8 +25,10 @@
 )
 from forms.utils.reference import RefType
 from forms.core.catalog import TEMP_TABLE_PREFIX
+
 temp_table_number: int = 0
 
+
 def break_down_into_subtrees(exec_tree: DBExecNode, enable_pipelining: bool) -> list:
     if isinstance(exec_tree, DBFuncExecNode):
         set_translatable_to_window(exec_tree)

systests/benchmark.py

@@ -134,6 +134,7 @@ def run(
             wb.compute_formula(formula_string)
             metrics = wb.get_metrics()
             output_payload = {
+                "formula_id": index + 1,
                 "formula_string": formula_string,
                 "run": run,
                 "optimization": optimization_str,

systests/formulas/ICRISAT_formula.csv

@@ -18,3 +18,13 @@
 =LOOKUP(F1, E$1:E$14853, D$1:D$14853, 0)
 =LOOKUP(F1, E$1:E$14853, D$1:D$14853, 1)
 =INDEX(E$1:E$14853,F1)
+=SUM(C1:D2, E1:F3)
+=SUM(C1:D2, $E$1:F1)
+=AVERAGE(C1:D2, $E$1:F1)
+=MAX(C1:D2, $E$1:F1)
+=C1+D2-E3
+=SUM(C1:D2)+E1
+=SUMIF(C1:D2, ">15") + E1
+=IF(E1>F1, SUM(C1:D2), AVERAGE(E1:F2))
+=IF(E1>F1, SUM(C1:D2), LOOKUP(F1, E$1:E$14853, D$1:D$14853, 0))
+=IF(F1> 5, C1, IF(F1 < 5, D1, E1))

systests/formulas/test_formula.csv

@@ -1,4 +1,10 @@
-=LOOKUP(F1, E$1:E$14853, D$1:D$14853, 0)
-=LOOKUP(F1, E$1:E$14853, D$1:D$14853, 1)
-=INDEX(E$1:E$14853,F1)
-=IF(E1>F1, G1, H1)
+=SUM(C1:D2, E1:F3)
+=SUM(C1:D2, $E$1:F1)
+=AVERAGE(C1:D2, $E$1:F1)
+=MAX(C1:D2, $E$1:F1)
+=C1+D2-E3
+=SUM(C1:D2)+E1
+=SUMIF(C1:D2, ">15") + E1
+=IF(E1>F1, SUM(C1:D2), AVERAGE(E1:F2))
+=IF(E1>F1, SUM(C1:D2), LOOKUP(F1, E$1:E$14853, D$1:D$14853, 0))
+=IF(F1> 5, C1, IF(F1 < 5, D1, E1))