Postfixes for #8418: new UNLIST function, by Alexey Chudaykin. Cleanup the unused parser rules. Fix result for multi-byte input. Add BLR filter for the new verb. Preserve the original charset of the input string/blob even if it's NONE.

Author: dyemanov

src/dsql/parse.y

@@ -6642,26 +6642,6 @@ table_value_function_correlation_name
 	: as_noise symbol_table_alias_name	{ $$ = $2; }
 	;
 
-%type <metaNameArray> table_value_function_columns
-table_value_function_columns
-	: table_value_function_column
-		{
-			ObjectsArray<MetaName>* node = newNode<ObjectsArray<MetaName>>();
-			node->add(*$1);
-			$$ = node;
-		}
-	| table_value_function_columns ',' table_value_function_column
-		{
-			ObjectsArray<MetaName>* node = $1;
-			node->add(*$3);
-			$$ = node;
-		}
-	;
-
-%type <metaNamePtr> table_value_function_column
-table_value_function_column
-	: symbol_column_name	{ $$ = $1; }
-	;
 
 // other clauses in the select expression
 

src/jrd/RecordSourceNodes.cpp

@@ -37,6 +37,7 @@
 #include "../dsql/metd_proto.h"
 #include "../dsql/pass1_proto.h"
 #include "../jrd/optimizer/Optimizer.h"
+#include "../dsql/DSqlDataTypeUtil.h"
 
 using namespace Firebird;
 using namespace Jrd;
@@ -4247,27 +4248,26 @@ dsql_fld* UnlistFunctionSourceNode::makeField(DsqlCompilerScratch* dsqlScratch)
 	if (inputList)
 		inputList = Node::doDsqlPass(dsqlScratch, inputList, false);
 
-	dsc desc;
-
-	auto inputItem = inputList->items.begin()->getObject();
+	const auto inputItem = inputList->items.begin()->getObject();
 	inputItem->setParameterType(
 		dsqlScratch, [](dsc* desc) { desc->makeVarying(1024, CS_dynamic); }, false);
 
 	dsql_fld* field = dsqlField;
 
 	if (!field)
 	{
-		auto newField = FB_NEW_POOL(dsqlScratch->getPool()) dsql_fld(dsqlScratch->getPool());
+		const auto newField = FB_NEW_POOL(dsqlScratch->getPool()) dsql_fld(dsqlScratch->getPool());
 		field = newField;
 
+		dsc desc;
 		DsqlDescMaker::fromNode(dsqlScratch, &desc, inputItem);
-
 		USHORT ttype = desc.getCharSet();
 
-		if (ttype == CS_NONE)
+		if (ttype == CS_NONE && !desc.isText() && !desc.isBlob())
 			ttype = CS_ASCII;
 
-		desc.makeText(32, ttype);
+		const auto bytesPerChar = DSqlDataTypeUtil(dsqlScratch).maxBytesPerChar(ttype);
+		desc.makeText(bytesPerChar * DEFAULT_UNLIST_TEXT_LENGTH, ttype);
 		MAKE_field(newField, &desc);
 		newField->fld_id = 0;
 	}

src/jrd/RecordSourceNodes.h

@@ -1033,6 +1033,7 @@ class UnlistFunctionSourceNode : public TableValueFunctionSourceNode
 	dsql_fld* makeField(DsqlCompilerScratch* dsqlScratch) final;
 
 	static constexpr char const* FUNC_NAME = "UNLIST";
+	static constexpr USHORT DEFAULT_UNLIST_TEXT_LENGTH = 32;
 };
 
 } // namespace Jrd

src/jrd/blp.h

@@ -261,5 +261,6 @@ static const struct
 	{"select_procedure", invsel_procedure},
 	{"default_arg", zero},
 	{"cast_format", cast_format},
+	{"table_value_fun", table_value_fun},
 	{0, 0}
 };

src/yvalve/gds.cpp

@@ -325,6 +325,7 @@ const int op_dcl_local_table	= 31;
 const int op_outer_map		= 32;
 const int op_invoke_function	= 33;
 const int op_invsel_procedure	= 34;
+const int op_table_value_fun	= 35;
 
 static const UCHAR
 	// generic print formats
@@ -419,7 +420,8 @@ static const UCHAR
 	in_list[] = { op_line, op_verb, op_indent, op_word, op_line, op_args, 0},
 	invoke_function[] = { op_invoke_function, 0 },
 	invsel_procedure[] = { op_invsel_procedure, 0 },
-	cast_format[] = { op_line, op_indent, op_byte, op_literal, op_line, op_indent, op_dtype, op_line, op_verb, 0 };
+	cast_format[] = { op_line, op_indent, op_byte, op_literal, op_line, op_indent, op_dtype, op_line, op_verb, 0 },
+	table_value_fun[] = { op_table_value_fun, 0 };
 
 
 #include "../jrd/blp.h"
@@ -4173,6 +4175,62 @@ static void blr_print_verb(gds_ctl* control, SSHORT level)
 			break;
 		}
 
+		case op_table_value_fun:
+		{
+			offset = blr_print_line(control, static_cast<SSHORT>(offset));
+
+			static const char* subCodes[] =
+			{
+				nullptr,
+				"unlist",
+			};
+
+			blr_indent(control, level);
+
+			blr_operator = control->ctl_blr_reader.getByte();
+
+			if (blr_operator == 0 || blr_operator >= FB_NELEM(subCodes))
+				blr_error(control, "*** invalid blr_table_value_fun sub code ***");
+
+			blr_format(control, "blr_table_value_fun_%s, ", subCodes[blr_operator]);
+
+			switch (blr_operator)
+			{
+				case blr_table_value_fun_unlist:
+
+					blr_print_byte(control);
+
+					blr_print_name(control);
+
+					n = blr_print_word(control);
+					offset = blr_print_line(control, static_cast<SSHORT>(offset));
+
+					++level;
+					while (n-- > 0)
+						blr_print_verb(control, level);
+
+					blr_indent(control, level);
+					n = blr_print_word(control);
+
+					while (n-- > 0)
+					{
+						offset = blr_print_line(control, static_cast<SSHORT>(offset));
+						blr_indent(control, level);
+						blr_print_dtype(control);
+						blr_print_name(control);
+					}
+					--level;
+
+					offset = blr_print_line(control, static_cast<SSHORT>(offset));
+					break;
+
+				default:
+					fb_assert(false);
+			}
+
+			break;
+		}
+
 		default:
 			fb_assert(false);
 			break;