Skip to content

Fix #8822: Some procedures containing LIST aggregate function are not restored in Firebird 6.0 #8839

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

Open
dyemanov wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −9
Open

Fix #8822: Some procedures containing LIST aggregate function are not restored in Firebird 6.0 #8839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions src/dsql/AggNodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,8 +935,12 @@ DmlNode* ListAggNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScratch*
ListAggNode* node = FB_NEW_POOL(pool) ListAggNode(pool, (blrOp == blr_agg_list_distinct));
node->arg = PAR_parse_value(tdbb, csb);
node->delimiter = PAR_parse_value(tdbb, csb);
if (csb->csb_blr_reader.peekByte() == blr_sort)
node->sort = PAR_sort(tdbb, csb, blr_sort, true);
if (csb->csb_blr_reader.peekByte() == blr_within_group_order)
{
csb->csb_blr_reader.getByte(); // skip blr_within_group_order
if (const auto count = csb->csb_blr_reader.getByte())
node->sort = PAR_sort_internal(tdbb, csb, true, count);
}

return node;
}
Expand Down Expand Up @@ -966,7 +970,7 @@ void ListAggNode::genBlr(DsqlCompilerScratch* dsqlScratch)
{
AggNode::genBlr(dsqlScratch);
if (dsqlOrderClause)
GEN_sort(dsqlScratch, blr_sort, dsqlOrderClause);
GEN_sort(dsqlScratch, blr_within_group_order, dsqlOrderClause);
}

bool ListAggNode::setParameterType(DsqlCompilerScratch* dsqlScratch,
Expand Down
2 changes: 1 addition & 1 deletion src/dsql/parse.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8685,7 +8685,7 @@ listagg_count_indication

%type <valueListNode> within_group_specification_opt
within_group_specification_opt
: /* nothing */ { $$ = newNode<ValueListNode>(0); }
: /* nothing */ { $$ = nullptr; }
| within_group_specification { $$ = $1; }
;

Expand Down
6 changes: 5 additions & 1 deletion src/include/firebird/impl/blr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,10 +507,12 @@

// Table value function
#define blr_table_value_fun (unsigned char) 229
// subcodes of blr_table_value_fun
#define blr_table_value_fun_unlist (unsigned char) 1
#define blr_table_value_fun_gen_series (unsigned char) 2

#define blr_for_range (unsigned char) 230
// subcodes of blr_for_range
#define blr_for_range_variable (unsigned char) 1
#define blr_for_range_initial_value (unsigned char) 2
#define blr_for_range_final_value (unsigned char) 3
Expand All @@ -523,9 +525,11 @@
#define blr_gen_id3 (unsigned char) 231
#define blr_default2 (unsigned char) 232
#define blr_current_schema (unsigned char) 233
#define blr_flags (unsigned char) 234

#define blr_flags (unsigned char) 234
// subcodes of blr_flags
#define blr_flags_search_system_schema (unsigned char) 1

#define blr_within_group_order (unsigned char) 235

#endif // FIREBIRD_IMPL_BLR_H
7 changes: 4 additions & 3 deletions src/jrd/blp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ static inline constexpr struct
{"cursor_stmt", cursor_stmt},
{"current_timestamp2", byte_line},
{"current_time2", byte_line},
{"agg_list", two}, // 170
{"agg_list_distinct", two},
{"agg_list", list_function}, // 170
{"agg_list_distinct", list_function},
{"modify2", modify2},
{"erase2", erase2},
// New BLR in FB1
Expand Down Expand Up @@ -229,7 +229,7 @@ static inline constexpr struct
{"partition_by", partition_by},
{"continue_loop", byte_line},
{"procedure4", procedure4},
{"agg_function", function},
{"agg_function", agg_function},
{"substring_similar", three}, // 200
{"bool_as_value", one},
{"coalesce", byte_args},
Expand Down Expand Up @@ -267,5 +267,6 @@ static inline constexpr struct
{"default2", default2},
{"current_schema", zero},
{NULL, NULL}, // flags - part of header
{NULL, NULL},
{0, 0}
};
19 changes: 18 additions & 1 deletion src/yvalve/gds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ constexpr int op_invoke_function = 33;
constexpr int op_invsel_procedure = 34;
constexpr int op_table_value_fun = 35;
constexpr int op_for_range = 36;
constexpr int op_within_group_order = 37;

static constexpr UCHAR
// generic print formats
Expand Down Expand Up @@ -433,7 +434,9 @@ static constexpr UCHAR
default2[] = { op_line, op_indent, op_byte, op_literal,
op_line, op_indent, op_byte, op_literal,
op_line, op_indent, op_byte, op_literal,
op_pad, op_line, 0};
op_pad, op_line, 0 },
list_function[] = { op_line, op_verb, op_verb, op_within_group_order, 0 },
agg_function[] = { op_byte, op_literal, op_byte, op_line, op_args, op_within_group_order, 0 };


#include "../jrd/blp.h"
Expand Down Expand Up @@ -4432,6 +4435,20 @@ static void blr_print_verb(gds_ctl* control, SSHORT level)
break;
}

case op_within_group_order:
{
if (control->ctl_blr_reader.peekByte() == blr_within_group_order)
{
blr_indent(control, level);
blr_print_blr(control, control->ctl_blr_reader.getByte());
n = blr_print_byte(control);
blr_print_line(control, (SSHORT) offset);
while (--n >= 0)
blr_print_verb(control, level + 1);
}
break;
}

default:
fb_assert(false);
break;
Expand Down
Loading