Skip to content

Add window functions #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dey4ss merged 12 commits into from
Jun 8, 2023
Merged

Add window functions #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
12ee548
[WIP] add window functions
dey4ss May 30, 2023
de92cd9
reserve enough space
dey4ss May 30, 2023
149841c
rename
dey4ss May 30, 2023
7f45a3f
redo frame bounds
dey4ss May 30, 2023
0a6f86f
remove debug include
dey4ss May 30, 2023
10908ec
<3 gcc
dey4ss May 30, 2023
1318536
review
dey4ss May 31, 2023
af8ac78
structure test cases a bit
dey4ss May 31, 2023
bca7ebf
add alias
dey4ss May 31, 2023
3c4550d
limit windows to functions expressions
dey4ss Jun 1, 2023
d90394a
opt_frame_clause
dey4ss Jun 7, 2023
3fdb20a
feedback
dey4ss Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,395 changes: 1,776 additions & 1,619 deletions src/parser/bison_parser.cpp
View file
Open in desktop

Large diffs are not rendered by default.

413 changes: 217 additions & 196 deletions src/parser/bison_parser.h
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 45 additions & 7 deletions src/parser/bison_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,14 @@
hsql::DatetimeField datetime_field;
hsql::DropColumnAction* drop_action_t;
hsql::Expr* expr;
hsql::FrameBound* frame_bound;
hsql::FrameDescription* frame_description;
hsql::FrameType frame_type;
hsql::GroupByDescription* group_t;
hsql::ImportType import_type_t;
hsql::JoinType join_type;
hsql::LimitDescription* limit;
hsql::LockingClause* locking_t;
hsql::OrderDescription* order;
hsql::OrderType order_type;
hsql::SetOperation* set_operator_t;
Expand All @@ -137,8 +141,8 @@
hsql::TableName table_name;
hsql::TableRef* table;
hsql::UpdateClause* update_t;
hsql::WindowDescription* window_description;
hsql::WithDescription* with_description_t;
hsql::LockingClause* locking_t;

std::vector<char*>* str_vec;
std::unordered_set<hsql::ConstraintType>* column_constraint_set;
Expand All @@ -161,7 +165,7 @@
** Destructor symbols
*********************************/
// clang-format off
%destructor { } <fval> <ival> <bval> <join_type> <order_type> <datetime_field> <column_type_t> <column_constraint_t> <import_type_t> <column_constraint_set> <lock_mode_t> <lock_wait_policy_t>
%destructor { } <fval> <ival> <bval> <join_type> <order_type> <datetime_field> <column_type_t> <column_constraint_t> <import_type_t> <column_constraint_set> <lock_mode_t> <lock_wait_policy_t> <frame_type>
%destructor {
free( ($$.name) );
free( ($$.schema) );
Expand Down Expand Up @@ -202,17 +206,18 @@
%token DOUBLE ESCAPE EXCEPT EXISTS EXTRACT CAST FORMAT GLOBAL HAVING IMPORT
%token INSERT ISNULL OFFSET RENAME SCHEMA SELECT SORTED
%token TABLES UNIQUE UNLOAD UPDATE VALUES AFTER ALTER CROSS
%token DELTA FLOAT GROUP INDEX INNER LIMIT LOCAL MERGE MINUS ORDER
%token DELTA FLOAT GROUP INDEX INNER LIMIT LOCAL MERGE MINUS ORDER OVER
%token OUTER RIGHT TABLE UNION USING WHERE CALL CASE CHAR COPY DATE DATETIME
%token DESC DROP ELSE FILE FROM FULL HASH HINT INTO JOIN
%token LEFT LIKE LOAD LONG NULL PLAN SHOW TEXT THEN TIME
%token LEFT LIKE LOAD LONG NULL PARTITION PLAN SHOW TEXT THEN TIME
%token VIEW WHEN WITH ADD ALL AND ASC END FOR INT KEY
%token NOT OFF SET TOP AS BY IF IN IS OF ON OR TO NO
%token ARRAY CONCAT ILIKE SECOND MINUTE HOUR DAY MONTH YEAR
%token SECONDS MINUTES HOURS DAYS MONTHS YEARS INTERVAL
%token TRUE FALSE BOOLEAN
%token TRANSACTION BEGIN COMMIT ROLLBACK
%token NOWAIT SKIP LOCKED SHARE
%token RANGE ROWS GROUPS UNBOUNDED FOLLOWING PRECEDING CURRENT_ROW

/*********************************
** Non-Terminal types (http://www.gnu.org/software/bison/manual/html_node/Type-Decl.html)
Expand All @@ -235,6 +240,10 @@
%type <table_name> table_name
%type <sval> opt_index_name
%type <sval> file_path prepare_target_query
%type <frame_description> opt_frame_clause
%type <frame_bound> frame_bound
%type <frame_type> frame_type
%type <window_description> opt_window
%type <bval> opt_not_exists opt_exists opt_distinct opt_all
%type <ival_pair> opt_decimal_specification
%type <ival> opt_time_precision
Expand Down Expand Up @@ -272,7 +281,7 @@
%type <import_type_t> opt_file_type file_type

%type <str_vec> ident_commalist opt_column_list
%type <expr_vec> expr_list select_list opt_literal_list literal_list hint_list opt_hints
%type <expr_vec> expr_list select_list opt_literal_list literal_list hint_list opt_hints opt_partition
%type <table_vec> table_ref_commalist
%type <order_vec> opt_order order_list
%type <with_description_vec> opt_with_clause with_clause with_description_list
Expand Down Expand Up @@ -978,8 +987,37 @@ comp_expr : operand '=' operand { $$ = Expr::makeOpBinary($1, kOpEquals, $3); }
| operand LESSEQ operand { $$ = Expr::makeOpBinary($1, kOpLessEq, $3); }
| operand GREATEREQ operand { $$ = Expr::makeOpBinary($1, kOpGreaterEq, $3); };

function_expr : IDENTIFIER '(' ')' { $$ = Expr::makeFunctionRef($1, new std::vector<Expr*>(), false); }
| IDENTIFIER '(' opt_distinct expr_list ')' { $$ = Expr::makeFunctionRef($1, $4, $3); };
// `function_expr is used for window functions, aggregate expressions, and functions calls because we run into shift/
// reduce conflicts when splitting them.
function_expr : IDENTIFIER '(' ')' opt_window { $$ = Expr::makeFunctionRef($1, new std::vector<Expr*>(), false, $4); }
Comment thread
dey4ss marked this conversation as resolved.
| IDENTIFIER '(' opt_distinct expr_list ')' opt_window { $$ = Expr::makeFunctionRef($1, $4, $3, $6); };

// Window function expressions, based on https://www.postgresql.org/docs/15/sql-expressions.html#SYNTAX-WINDOW-FUNCTIONS
// We do not support named windows, collations and exclusions (for simplicity) and filters (not part of the SQL standard).
opt_window : OVER '(' opt_partition opt_order opt_frame_clause ')' { $$ = new WindowDescription($3, $4, $5); }
| /* empty */ { $$ = nullptr; };

opt_partition : PARTITION BY expr_list { $$ = $3; }
| /* empty */ { $$ = nullptr; };

// We use the Postgres default if the frame end or the whole frame clause is omitted. "If `frame_end` is omitted, the
// end defaults to `CURRENT ROW`. [...] The default framing option is `RANGE UNBOUNDED PRECEDING`, which is the same as
// `RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW`."
opt_frame_clause : frame_type frame_bound { $$ = new FrameDescription{$1, $2, new FrameBound{0, kCurrentRow, false}}; }
| frame_type BETWEEN frame_bound AND frame_bound { $$ = new FrameDescription{$1, $3, $5}; }
| /* empty */ {
$$ = new FrameDescription{kRange, new FrameBound{0, kPreceding, true}, new FrameBound{0, kCurrentRow, false}};
};

frame_type : RANGE { $$ = kRange; }
| ROWS { $$ = kRows; }
| GROUPS { $$ = kGroups; };

frame_bound : UNBOUNDED PRECEDING { $$ = new FrameBound{0, kPreceding, true}; }
| INTVAL PRECEDING { $$ = new FrameBound{$1, kPreceding, false}; }
| UNBOUNDED FOLLOWING { $$ = new FrameBound{0, kFollowing, true}; }
| INTVAL FOLLOWING { $$ = new FrameBound{$1, kFollowing, false}; }
| CURRENT_ROW { $$ = new FrameBound{0, kCurrentRow, false}; };

extract_expr : EXTRACT '(' datetime_field FROM expr ')' { $$ = Expr::makeExtract($3, $5); };

Expand Down
Loading