-
Notifications
You must be signed in to change notification settings - Fork 279
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
For avg functions replacing it with (sum / count)
The commit involves converting avg function expressions to (sum / count) function expressions in the SQL planner and test updates accordingly. Tests cover both the regular and exceptional cases. Corresponding changes are reflected in other parts of the code like ProjectBinder and Aggregate operators.
- Loading branch information
1 parent
6bdfbc1
commit aa14de8
Showing
9 changed files
with
242 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| import numpy as np | ||
| import random | ||
| import os | ||
| import argparse | ||
|
|
||
|
|
||
| def generate(generate_if_exists: bool, copy_dir: str): | ||
| row_n = 8000 | ||
| sort_dir = "./test/data/csv" | ||
| slt_dir = "./test/sql/dql" | ||
|
|
||
| table_name = "test_simple_agg_big_cpp" | ||
| agg_path = sort_dir + "/test_simple_agg_big.csv" | ||
| slt_path = slt_dir + "/test_simple_agg_big.slt" | ||
| copy_path = copy_dir + "/test_simple_agg_big.csv" | ||
|
|
||
| os.makedirs(sort_dir, exist_ok=True) | ||
| os.makedirs(slt_dir, exist_ok=True) | ||
| if os.path.exists(agg_path) and os.path.exists(slt_path) and generate_if_exists: | ||
| print( | ||
| "File {} and {} already existed exists. Skip Generating.".format( | ||
| slt_path, agg_path | ||
| ) | ||
| ) | ||
| return | ||
| with open(agg_path, "w") as agg_file, open(slt_path, "w") as slt_file: | ||
| slt_file.write("statement ok\n") | ||
| slt_file.write("DROP TABLE IF EXISTS {};\n".format(table_name)) | ||
| slt_file.write("\n") | ||
| slt_file.write("statement ok\n") | ||
| slt_file.write( | ||
| "CREATE TABLE {} (c1 int, c2 float);\n".format(table_name) | ||
| ) | ||
| slt_file.write("\n") | ||
| slt_file.write("query I\n") | ||
| slt_file.write( | ||
| "COPY {} FROM '{}' WITH ( DELIMITER ',' );\n".format( | ||
| table_name, copy_path | ||
| ) | ||
| ) | ||
|
|
||
|
|
||
| sequence = np.arange(1, 8001) | ||
|
|
||
| for i in sequence: | ||
| agg_file.write(str(i) + "," + str(i)) | ||
| agg_file.write("\n") | ||
|
|
||
|
|
||
| # select max(c1) from test_simple_agg_big | ||
|
|
||
| slt_file.write("\n") | ||
| slt_file.write("query I\n") | ||
| slt_file.write("SELECT max(c1) FROM {};\n".format(table_name)) | ||
| slt_file.write("----\n") | ||
| slt_file.write(str(8000)) | ||
| slt_file.write("\n") | ||
|
|
||
| # select min(c2) from test_simple_agg_big | ||
|
|
||
| slt_file.write("\n") | ||
| slt_file.write("query I\n") | ||
| slt_file.write("SELECT min(c1) FROM {};\n".format(table_name)) | ||
| slt_file.write("----\n") | ||
| slt_file.write(str(1)) | ||
| slt_file.write("\n") | ||
|
|
||
|
|
||
| # select sum(c1) from test_simple_agg_big | ||
|
|
||
| slt_file.write("\n") | ||
| slt_file.write("query I\n") | ||
| slt_file.write("SELECT sum(c1) FROM {};\n".format(table_name)) | ||
| slt_file.write("----\n") | ||
| slt_file.write(str(np.sum(sequence))) | ||
| slt_file.write("\n") | ||
|
|
||
|
|
||
| # select avg(c1) from test_simple_agg_big | ||
|
|
||
| # slt_file.write("\n") | ||
| # slt_file.write("query I\n") | ||
| # slt_file.write("SELECT AVG(c1) FROM {};\n".format(table_name)) | ||
| # slt_file.write("----\n") | ||
| # slt_file.write(str(np.mean(sequence))) | ||
| # slt_file.write("\n") | ||
|
|
||
| # select count(c1) from test_simple_agg_big | ||
| slt_file.write("\n") | ||
| slt_file.write("query I\n") | ||
| slt_file.write("SELECT count(c1) FROM {};\n".format(table_name)) | ||
| slt_file.write("----\n") | ||
| slt_file.write(str(8000)) | ||
| slt_file.write("\n") | ||
|
|
||
|
|
||
|
|
||
|
|
||
| slt_file.write("\n") | ||
| slt_file.write("statement ok\n") | ||
| slt_file.write("DROP TABLE {};\n".format(table_name)) | ||
| random.random() | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| parser = argparse.ArgumentParser(description="Generate limit data for test") | ||
|
|
||
| parser.add_argument( | ||
| "-g", | ||
| "--generate", | ||
| type=bool, | ||
| default=False, | ||
| dest="generate_if_exists", | ||
| ) | ||
| parser.add_argument( | ||
| "-c", | ||
| "--copy", | ||
| type=str, | ||
| default="/tmp/infinity/test_data", | ||
| dest="copy_dir", | ||
| ) | ||
| args = parser.parse_args() | ||
| generate(args.generate_if_exists, args.copy_dir) |
Oops, something went wrong.