Fix issues with longish concatenated context aliases

dyemanov · dyemanov · commit f5e7c62107f0 · 2025-04-01T19:59:40.000+03:00
diff --git a/src/jrd/RecordSourceNodes.cpp b/src/jrd/RecordSourceNodes.cpp
@@ -54,6 +54,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.
@@ -687,7 +701,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);
 }
@@ -885,7 +899,7 @@ void RelationSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 	}
 
 	if (dsqlContext->ctx_alias.hasData())
-		dsqlScratch->appendMetaString(dsqlContext->ctx_alias.c_str());
+		appendContextAlias(dsqlScratch, dsqlContext->ctx_alias);
 
 	GEN_stuff_context(dsqlScratch, dsqlContext);
 }
@@ -1507,7 +1521,7 @@ void ProcedureSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 		if (dsqlContext->ctx_alias.hasData())
 		{
 			dsqlScratch->appendUChar(blr_invsel_procedure_alias);
-			dsqlScratch->appendMetaString(dsqlContext->ctx_alias.c_str());
+			appendContextAlias(dsqlScratch, dsqlContext->ctx_alias);
 		}
 
 		dsqlScratch->appendUChar(blr_end);
@@ -1519,7 +1533,7 @@ void ProcedureSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 	{
 		dsqlScratch->appendUChar(blr_subproc);
 		dsqlScratch->appendMetaString(dsqlProcedure->prc_name.identifier.c_str());
-		dsqlScratch->appendMetaString(dsqlContext->ctx_alias.c_str());
+		appendContextAlias(dsqlScratch, dsqlContext->ctx_alias);
 	}
 	else
 	{
@@ -1546,7 +1560,7 @@ void ProcedureSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 		}
 
 		if (dsqlContext->ctx_alias.hasData())
-			dsqlScratch->appendMetaString(dsqlContext->ctx_alias.c_str());
+			appendContextAlias(dsqlScratch, dsqlContext->ctx_alias);
 	}
 
 	GEN_stuff_context(dsqlScratch, dsqlContext);
@@ -4079,7 +4093,7 @@ void TableValueFunctionSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 
 	GEN_stuff_context(dsqlScratch, dsqlContext);
 
-	dsqlScratch->appendMetaString(dsqlContext->ctx_alias.c_str());
+	appendContextAlias(dsqlScratch, dsqlContext->ctx_alias);
 
 	dsqlScratch->appendUShort(dsqlContext->ctx_proc_inputs->items.getCount());
 	for (auto& arg : dsqlContext->ctx_proc_inputs->items)
diff --git a/src/jrd/recsrc/BitmapTableScan.cpp b/src/jrd/recsrc/BitmapTableScan.cpp
@@ -148,6 +148,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 != m_alias)
+	if (m_alias.hasData() && m_alias != m_relation->rel_name.c_str())
 		planEntry.alias = m_alias;
 }
diff --git a/src/jrd/recsrc/ExternalTableScan.cpp b/src/jrd/recsrc/ExternalTableScan.cpp
@@ -136,6 +136,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 != m_alias)
+	if (m_alias.hasData() && m_alias != m_relation->rel_name.c_str())
 		planEntry.alias = m_alias;
 }
diff --git a/src/jrd/recsrc/FullTableScan.cpp b/src/jrd/recsrc/FullTableScan.cpp
@@ -197,6 +197,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 != m_alias)
+	if (m_alias.hasData() && m_alias != m_relation->rel_name.c_str())
 		planEntry.alias = m_alias;
 }
diff --git a/src/jrd/recsrc/IndexTableScan.cpp b/src/jrd/recsrc/IndexTableScan.cpp
@@ -403,7 +403,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 != m_alias)
+	if (m_alias.hasData() && m_alias != m_relation->rel_name.c_str())
 		planEntry.alias = m_alias;
 
 	if (m_inversion)
diff --git a/src/jrd/recsrc/RecordSource.h b/src/jrd/recsrc/RecordSource.h
@@ -127,7 +127,7 @@ namespace Jrd
 		std::optional<ObjectType> objectType;
 		MetaName packageName;
 		MetaName objectName;
-		MetaName alias;
+		Firebird::string alias{getPool()};
 		const AccessPath* accessPath = nullptr;
 		ULONG recordLength = 0;
 		ULONG keyLength = 0;
diff --git a/src/jrd/recsrc/VirtualTableScan.cpp b/src/jrd/recsrc/VirtualTableScan.cpp
@@ -130,6 +130,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 != m_alias)
+	if (m_alias.hasData() && m_alias != m_relation->rel_name.c_str())
 		planEntry.alias = m_alias;
 }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,20 @@ static ValueExprNode* resolveUsingField(DsqlCompilerScratch* dsqlScratch, const`
`54`	`54`
`55`	`55`	`namespace`
`56`	`56`	`{`
	`57`	`+ void appendContextAlias(DsqlCompilerScratch* dsqlScratch, const string& alias)`
	`58`	`+ {`
	`59`	`+ const auto len = alias.length();`
	`60`	`+ if (len <= MAX_UCHAR)`
	`61`	`+ dsqlScratch->appendMetaString(alias.c_str());`
	`62`	`+ else`
	`63`	`+ {`
	`64`	`+ string truncatedAlias(alias);`
	`65`	`+ truncatedAlias.resize(MAX_UCHAR - 3);`
	`66`	`+ truncatedAlias += "...";`
	`67`	`+ dsqlScratch->appendMetaString(truncatedAlias.c_str());`
	`68`	`+ }`
	`69`	`+ }`
	`70`	`+`
`57`	`71`	`// Search through the list of ANDed booleans to find comparisons`
`58`	`72`	`// referring streams of parent select expressions.`
`59`	`73`	`// Extract those booleans and return them to the caller.`
`@@ -687,7 +701,7 @@ void LocalTableSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)`
`687`	`701`	`{`
`688`	`702`	`dsqlScratch->appendUChar(blr_local_table_id);`
`689`	`703`	`dsqlScratch->appendUShort(tableNumber);`
`690`		`- dsqlScratch->appendMetaString(alias.c_str()); // dsqlContext->ctx_alias?`
	`704`	`+ appendContextAlias(dsqlScratch, alias); // dsqlContext->ctx_alias?`
`691`	`705`
`692`	`706`	`GEN_stuff_context(dsqlScratch, dsqlContext);`
`693`	`707`	`}`
`@@ -885,7 +899,7 @@ void RelationSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)`
`885`	`899`	`}`
`886`	`900`
`887`	`901`	`if (dsqlContext->ctx_alias.hasData())`
`888`		`- dsqlScratch->appendMetaString(dsqlContext->ctx_alias.c_str());`
	`902`	`+ appendContextAlias(dsqlScratch, dsqlContext->ctx_alias);`
`889`	`903`
`890`	`904`	`GEN_stuff_context(dsqlScratch, dsqlContext);`
`891`	`905`	`}`
`@@ -1507,7 +1521,7 @@ void ProcedureSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)`
`1507`	`1521`	`if (dsqlContext->ctx_alias.hasData())`
`1508`	`1522`	`{`
`1509`	`1523`	`dsqlScratch->appendUChar(blr_invsel_procedure_alias);`
`1510`		`- dsqlScratch->appendMetaString(dsqlContext->ctx_alias.c_str());`
	`1524`	`+ appendContextAlias(dsqlScratch, dsqlContext->ctx_alias);`
`1511`	`1525`	`}`
`1512`	`1526`
`1513`	`1527`	`dsqlScratch->appendUChar(blr_end);`
`@@ -1519,7 +1533,7 @@ void ProcedureSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)`
`1519`	`1533`	`{`
`1520`	`1534`	`dsqlScratch->appendUChar(blr_subproc);`
`1521`	`1535`	`dsqlScratch->appendMetaString(dsqlProcedure->prc_name.identifier.c_str());`
`1522`		`- dsqlScratch->appendMetaString(dsqlContext->ctx_alias.c_str());`
	`1536`	`+ appendContextAlias(dsqlScratch, dsqlContext->ctx_alias);`
`1523`	`1537`	`}`
`1524`	`1538`	`else`
`1525`	`1539`	`{`
`@@ -1546,7 +1560,7 @@ void ProcedureSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)`
`1546`	`1560`	`}`
`1547`	`1561`
`1548`	`1562`	`if (dsqlContext->ctx_alias.hasData())`
`1549`		`- dsqlScratch->appendMetaString(dsqlContext->ctx_alias.c_str());`
	`1563`	`+ appendContextAlias(dsqlScratch, dsqlContext->ctx_alias);`
`1550`	`1564`	`}`
`1551`	`1565`
`1552`	`1566`	`GEN_stuff_context(dsqlScratch, dsqlContext);`
`@@ -4079,7 +4093,7 @@ void TableValueFunctionSourceNode::genBlr(DsqlCompilerScratch* dsqlScratch)`
`4079`	`4093`
`4080`	`4094`	`GEN_stuff_context(dsqlScratch, dsqlContext);`
`4081`	`4095`
`4082`		`- dsqlScratch->appendMetaString(dsqlContext->ctx_alias.c_str());`
	`4096`	`+ appendContextAlias(dsqlScratch, dsqlContext->ctx_alias);`
`4083`	`4097`
`4084`	`4098`	`dsqlScratch->appendUShort(dsqlContext->ctx_proc_inputs->items.getCount());`
`4085`	`4099`	`for (auto& arg : dsqlContext->ctx_proc_inputs->items)`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,6 @@ void BitmapTableScan::internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, uns`
`148`	`148`	`planEntry.objectType = m_relation->getObjectType();`
`149`	`149`	`planEntry.objectName = m_relation->rel_name;`
`150`	`150`
`151`		`- if (m_alias.hasData() && m_relation->rel_name != m_alias)`
	`151`	`+ if (m_alias.hasData() && m_alias != m_relation->rel_name.c_str())`
`152`	`152`	`planEntry.alias = m_alias;`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,6 @@ void ExternalTableScan::internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, u`
`136`	`136`	`planEntry.objectType = m_relation->getObjectType();`
`137`	`137`	`planEntry.objectName = m_relation->rel_name;`
`138`	`138`
`139`		`- if (m_alias.hasData() && m_relation->rel_name != m_alias)`
	`139`	`+ if (m_alias.hasData() && m_alias != m_relation->rel_name.c_str())`
`140`	`140`	`planEntry.alias = m_alias;`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,6 @@ void FullTableScan::internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, unsig`
`197`	`197`	`planEntry.objectType = m_relation->getObjectType();`
`198`	`198`	`planEntry.objectName = m_relation->rel_name;`
`199`	`199`
`200`		`- if (m_alias.hasData() && m_relation->rel_name != m_alias)`
	`200`	`+ if (m_alias.hasData() && m_alias != m_relation->rel_name.c_str())`
`201`	`201`	`planEntry.alias = m_alias;`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,6 @@ void VirtualTableScan::internalGetPlan(thread_db* tdbb, PlanEntry& planEntry, un`
`130`	`130`	`planEntry.objectType = m_relation->getObjectType();`
`131`	`131`	`planEntry.objectName = m_relation->rel_name;`
`132`	`132`
`133`		`- if (m_alias.hasData() && m_relation->rel_name != m_alias)`
	`133`	`+ if (m_alias.hasData() && m_alias != m_relation->rel_name.c_str())`
`134`	`134`	`planEntry.alias = m_alias;`
`135`	`135`	`}`