Fix issues with longish concatenated context aliases (#8494)

Author: dyemanov

src/jrd/RecordSourceNodes.cpp

@@ -55,6 +55,20 @@ static ValueExprNode* resolveUsingField(DsqlCompilerScratch* dsqlScratch, const
 
 namespace
 {
+	void appendContextAlias(DsqlCompilerScratch* dsqlScratch, const string& alias)
+	{
+		const auto len = alias.length();
+		if (len <= MAX_UCHAR)
+			dsqlScratch->appendMetaString(alias.c_str());
+		else
+		{
+			string truncatedAlias(alias);
+			truncatedAlias.resize(MAX_UCHAR - 3);
+			truncatedAlias += "...";
+			dsqlScratch->appendMetaString(truncatedAlias.c_str());
+		}
+	}
+
 	// Search through the list of ANDed booleans to find comparisons
 	// referring streams of parent select expressions.
 	// Extract those booleans and return them to the caller.
@@ -677,7 +691,7 @@ void LocalTableSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 {
 	dsqlScratch->appendUChar(blr_local_table_id);
 	dsqlScratch->appendUShort(tableNumber);
-	dsqlScratch->appendMetaString(alias.c_str());	// dsqlContext->ctx_alias?
+	appendContextAlias(dsqlScratch, alias); // dsqlContext->ctx_alias?
 
 	GEN_stuff_context(dsqlScratch, dsqlContext);
 }
@@ -893,7 +907,7 @@ void RelationSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 	if (dsqlContext->ctx_alias.hasData())
 	{
 		const auto& contextAliases = dsqlContext->getConcatenatedAlias();
-		dsqlScratch->appendMetaString(contextAliases.c_str());
+		appendContextAlias(dsqlScratch, contextAliases);
 	}
 
 	GEN_stuff_context(dsqlScratch, dsqlContext);
@@ -1546,7 +1560,7 @@ void ProcedureSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 			dsqlScratch->appendUChar(blr_invsel_procedure_alias);
 
 			const auto& contextAliases = dsqlContext->getConcatenatedAlias();
-			dsqlScratch->appendMetaString(contextAliases.c_str());
+			appendContextAlias(dsqlScratch, contextAliases);
 		}
 
 		dsqlScratch->appendUChar(blr_end);
@@ -1560,7 +1574,7 @@ void ProcedureSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 		dsqlScratch->appendMetaString(dsqlProcedure->prc_name.object.c_str());
 
 		const auto& contextAliases = dsqlContext->getConcatenatedAlias();
-		dsqlScratch->appendMetaString(contextAliases.c_str());
+		appendContextAlias(dsqlScratch, contextAliases);
 	}
 	else
 	{
@@ -1589,7 +1603,7 @@ void ProcedureSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 		if (dsqlContext->ctx_alias.hasData())
 		{
 			const auto& contextAliases = dsqlContext->getConcatenatedAlias();
-			dsqlScratch->appendMetaString(contextAliases.c_str());
+			appendContextAlias(dsqlScratch, contextAliases);
 		}
 	}
 
@@ -4150,11 +4164,8 @@ void TableValueFunctionSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 
 	GEN_stuff_context(dsqlScratch, dsqlContext);
 
-	if (dsqlContext->ctx_alias.hasData())
-	{
-		const auto& contextAliases = dsqlContext->getConcatenatedAlias();
-		dsqlScratch->appendMetaString(contextAliases.c_str());
-	}
+	const auto& contextAliases = dsqlContext->getConcatenatedAlias();
+	appendContextAlias(dsqlScratch, contextAliases);
 
 	dsqlScratch->appendUShort(dsqlContext->ctx_proc_inputs->items.getCount());
 	for (auto& arg : dsqlContext->ctx_proc_inputs->items)

src/jrd/recsrc/BitmapTableScan.cpp

@@ -149,6 +149,6 @@ void BitmapTableScan::internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, uns
 	planEntry.objectType = m_relation->getObjectType();
 	planEntry.objectName = m_relation->rel_name;
 
-	if (m_alias.hasData() && m_relation->rel_name.object != m_alias)
+	if (m_alias.hasData() && m_alias != string(m_relation->rel_name.object))
 		planEntry.alias = m_alias;
 }

src/jrd/recsrc/ExternalTableScan.cpp

@@ -137,6 +137,6 @@ void ExternalTableScan::internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, u
 	planEntry.objectType = m_relation->getObjectType();
 	planEntry.objectName = m_relation->rel_name;
 
-	if (m_alias.hasData() && m_relation->rel_name.object != m_alias)
+	if (m_alias.hasData() && m_alias != string(m_relation->rel_name.object))
 		planEntry.alias = m_alias;
 }

src/jrd/recsrc/FullTableScan.cpp

@@ -198,6 +198,6 @@ void FullTableScan::internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, unsig
 	planEntry.objectType = m_relation->getObjectType();
 	planEntry.objectName = m_relation->rel_name;
 
-	if (m_alias.hasData() && m_relation->rel_name.object != m_alias)
+	if (m_alias.hasData() && m_alias != string(m_relation->rel_name.object))
 		planEntry.alias = m_alias;
 }

src/jrd/recsrc/IndexTableScan.cpp

@@ -404,7 +404,7 @@ void IndexTableScan::internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, unsi
 	planEntry.objectType = m_relation->getObjectType();
 	planEntry.objectName = m_relation->rel_name;
 
-	if (m_alias.hasData() && m_relation->rel_name.object != m_alias)
+	if (m_alias.hasData() && m_alias != string(m_relation->rel_name.object))
 		planEntry.alias = m_alias;
 
 	if (m_inversion)

src/jrd/recsrc/RecordSource.h

@@ -126,7 +126,7 @@ namespace Jrd
 		Firebird::ObjectsArray<PlanEntry> children{getPool()};
 		std::optional<ObjectType> objectType;
 		QualifiedName objectName;
-		MetaName alias;
+		Firebird::string alias{getPool()};
 		const AccessPath* accessPath = nullptr;
 		ULONG recordLength = 0;
 		ULONG keyLength = 0;

src/jrd/recsrc/VirtualTableScan.cpp

@@ -131,6 +131,6 @@ void VirtualTableScan::internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, un
 	planEntry.objectType = m_relation->getObjectType();
 	planEntry.objectName = m_relation->rel_name;
 
-	if (m_alias.hasData() && m_relation->rel_name.object != m_alias)
+	if (m_alias.hasData() && m_alias != string(m_relation->rel_name.object))
 		planEntry.alias = m_alias;
 }