Skip to content

Move the call of the checkArgsMismatch function before the call of th… #8242

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
merged 2 commits into from
Oct 7, 2025
Merged

Move the call of the checkArgsMismatch function before the call of th… #8242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4330b1c
Move the call of the checkArgsMismatch function before the call of th…
Sep 5, 2024
b41b128
Replace unneeded checks with asserts. Move the JRD-level validation f…
dyemanov Oct 6, 2025
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
19 changes: 11 additions & 8 deletions src/dsql/ExprNodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12321,6 +12321,8 @@ DmlNode* SysFuncCallNode::parse(thread_db* tdbb, MemoryPool& pool, CompilerScrat

node->args = PAR_args(tdbb, csb);

node->function->checkArgsMismatch(node->args->items.getCount());

if (name == "MAKE_DBKEY")
{
// Special handling for system function MAKE_DBKEY:
Expand Down Expand Up @@ -12386,7 +12388,6 @@ void SysFuncCallNode::make(DsqlCompilerScratch* dsqlScratch, dsc* desc)
}

DSqlDataTypeUtil dataTypeUtil(dsqlScratch);
function->checkArgsMismatch(argsArray.getCount());
function->makeFunc(&dataTypeUtil, function, desc, argsArray.getCount(), argsArray.begin());
}

Expand Down Expand Up @@ -12448,8 +12449,6 @@ ValueExprNode* SysFuncCallNode::pass2(thread_db* tdbb, CompilerScratch* csb)
{
ValueExprNode::pass2(tdbb, csb);

function->checkArgsMismatch(args->items.getCount());

dsc desc;
getDesc(tdbb, csb, &desc);
impureOffset = csb->allocImpure<impure_value>();
Expand Down Expand Up @@ -12481,14 +12480,18 @@ ValueExprNode* SysFuncCallNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)

if (node->function)
{
auto& items = node->args->items;

node->function->checkArgsMismatch(items.getCount());

if (node->function->setParamsFunc)
{
Array<dsc> tempDescs(node->args->items.getCount());
tempDescs.resize(node->args->items.getCount());
Array<dsc> tempDescs(items.getCount());
tempDescs.resize(items.getCount());

Array<dsc*> argsArray(node->args->items.getCount());
Array<dsc*> argsArray(items.getCount());

for (auto& item : node->args->items)
for (auto& item : items)
{
DsqlDescMaker::fromNode(dsqlScratch, item);

Expand All @@ -12507,7 +12510,7 @@ ValueExprNode* SysFuncCallNode::dsqlPass(DsqlCompilerScratch* dsqlScratch)
node->function->setParamsFunc(&dataTypeUtil, node->function,
argsArray.getCount(), argsArray.begin());

for (auto& item : node->args->items)
for (auto& item : items)
{
PASS1_set_parameter_type(dsqlScratch, item,
[&] (dsc* desc) { *desc = item->getDsqlDesc(); },
Expand Down
193 changes: 98 additions & 95 deletions src/jrd/SysFunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,24 +611,27 @@ void setParamsInt64(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc**

void setParamsSecondInteger(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 2)
{
if (args[1]->isUnknown())
args[1]->makeLong(0);
}
fb_assert(argsCount >= 2);

if (args[1]->isUnknown())
args[1]->makeLong(0);
}


void setParamsAsciiVal(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 1 && args[0]->isUnknown())
fb_assert(argsCount >= 1);

if (args[0]->isUnknown())
args[0]->makeText(1, CS_ASCII);
}


void setParamsBlobAppend(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 1 && args[0]->isUnknown())
fb_assert(argsCount >= 1);

if (args[0]->isUnknown())
args[0]->makeBlob(isc_blob_text, CS_dynamic);

for (int i = 1; i < argsCount; ++i)
Expand All @@ -641,14 +644,18 @@ void setParamsBlobAppend(DataTypeUtilBase*, const SysFunction*, int argsCount, d

void setParamsCharToUuid(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 1 && args[0]->isUnknown())
fb_assert(argsCount >= 1);

if (args[0]->isUnknown())
args[0]->makeText(Uuid::STR_LEN, ttype_ascii);
}


void setParamsDateAdd(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 1 && args[0]->isUnknown())
fb_assert(argsCount >= 3);

if (args[0]->isUnknown())
{
if (args[1]->dsc_address && // constant
CVT_get_long(args[1], 0, JRD_get_thread_data()->getAttachment()->att_dec_status, ERR_post) == blr_extract_millisecond)
Expand All @@ -659,31 +666,32 @@ void setParamsDateAdd(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc*
args[0]->makeInt64(0);
}

if (argsCount >= 3 && args[2]->isUnknown())
if (args[2]->isUnknown())
args[2]->makeTimestamp();
}


void setParamsDateDiff(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 3)
fb_assert(argsCount >= 3);

if (args[1]->isUnknown() && args[2]->isUnknown())
{
if (args[1]->isUnknown() && args[2]->isUnknown())
{
args[1]->makeTimestamp();
args[2]->makeTimestamp();
}
else if (args[1]->isUnknown())
*args[1] = *args[2];
else if (args[2]->isUnknown())
*args[2] = *args[1];
args[1]->makeTimestamp();
args[2]->makeTimestamp();
}
else if (args[1]->isUnknown())
*args[1] = *args[2];
else if (args[2]->isUnknown())
*args[2] = *args[1];
}


void setParamsUnicodeVal(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 1 && args[0]->isUnknown())
fb_assert(argsCount >= 1);

if (args[0]->isUnknown())
args[0]->makeText(4, CS_UTF8);
}

Expand Down Expand Up @@ -819,23 +827,24 @@ void setParamsRsaPublic(DataTypeUtilBase*, const SysFunction*, int argsCount, ds

void setParamsFirstLastDay(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 2)
{
if (args[1]->isUnknown())
args[1]->makeTimestamp();
}
fb_assert(argsCount >= 2);

if (args[1]->isUnknown())
args[1]->makeTimestamp();
}


void setParamsGetSetContext(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 1 && args[0]->isUnknown())
fb_assert(argsCount >= 2);

if (args[0]->isUnknown())
{
args[0]->makeVarying(80, ttype_none);
args[0]->setNullable(true);
}

if (argsCount >= 2 && args[1]->isUnknown())
if (args[1]->isUnknown())
{
args[1]->makeVarying(80, ttype_none);
args[1]->setNullable(true);
Expand All @@ -861,86 +870,84 @@ void setParamsMakeDbkey(DataTypeUtilBase*, const SysFunction*, int argsCount, ds
{
// MAKE_DBKEY ( REL_NAME | REL_ID, RECNUM [, DPNUM [, PPNUM] ] )

if (argsCount > 1)
{
if (args[0]->isUnknown())
args[0]->makeLong(0);
fb_assert(argsCount >= 2);

if (args[1]->isUnknown())
args[1]->makeInt64(0);
}
if (args[0]->isUnknown())
args[0]->makeLong(0);

if (argsCount > 2 && args[2]->isUnknown())
if (args[1]->isUnknown())
args[1]->makeInt64(0);

if (argsCount >= 3 && args[2]->isUnknown())
args[2]->makeInt64(0);

if (argsCount > 3 && args[3]->isUnknown())
if (argsCount >= 4 && args[3]->isUnknown())
args[3]->makeInt64(0);
}


void setParamsOverlay(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 3)
fb_assert(argsCount >= 3);

if (!(args[0]->isUnknown() && args[1]->isUnknown()))
{
if (!(args[0]->isUnknown() && args[1]->isUnknown()))
{
if (args[1]->isUnknown())
*args[1] = *args[0];
else if (args[0]->isUnknown())
*args[0] = *args[1];
}
if (args[1]->isUnknown())
*args[1] = *args[0];
else if (args[0]->isUnknown())
*args[0] = *args[1];
}

if (argsCount >= 4)
if (argsCount >= 4)
{
if (args[2]->isUnknown() && args[3]->isUnknown())
{
if (args[2]->isUnknown() && args[3]->isUnknown())
{
args[2]->makeLong(0);
args[3]->makeLong(0);
}
else if (args[2]->isUnknown())
*args[2] = *args[3];
else if (args[3]->isUnknown())
*args[3] = *args[2];
}

if (args[2]->isUnknown())
args[2]->makeLong(0);
args[3]->makeLong(0);
}
else if (args[2]->isUnknown())
*args[2] = *args[3];
else if (args[3]->isUnknown())
*args[3] = *args[2];
}

if (args[2]->isUnknown())
args[2]->makeLong(0);
}


void setParamsPosition(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 2)
{
if (args[0]->isUnknown())
*args[0] = *args[1];
fb_assert(argsCount >= 2);

if (args[1]->isUnknown())
*args[1] = *args[0];
}
if (args[0]->isUnknown())
*args[0] = *args[1];

if (args[1]->isUnknown())
*args[1] = *args[0];
}


void setParamsRoundTrunc(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 1)
{
if (args[0]->isUnknown())
args[0]->makeDouble();
fb_assert(argsCount >= 1);

if (argsCount >= 2)
{
if (args[1]->isUnknown())
args[1]->makeLong(0);
}
if (args[0]->isUnknown())
args[0]->makeDouble();

if (argsCount >= 2)
{
if (args[1]->isUnknown())
args[1]->makeLong(0);
}
}


void setParamsUuidToChar(DataTypeUtilBase*, const SysFunction*, int argsCount, dsc** args)
{
if (argsCount >= 1 && args[0]->isUnknown())
fb_assert(argsCount >= 1);

if (args[0]->isUnknown())
args[0]->makeText(16, ttype_binary);
}

Expand Down Expand Up @@ -1304,23 +1311,20 @@ void makeBlobAppend(DataTypeUtilBase* dataTypeUtil, const SysFunction* function,
result->makeBlob(isc_blob_untyped, ttype_binary);
result->setNullable(true);

if (argsCount > 0)
for (int i = 0; i < argsCount; ++i)
{
for (int i = 0; i < argsCount; ++i)
{
if (makeBlobAppendBlob(result, args[i]))
break;
}
if (makeBlobAppendBlob(result, args[i]))
break;
}

result->setNullable(true);
result->setNullable(true);

for (int i = 0; i < argsCount; ++i)
for (int i = 0; i < argsCount; ++i)
{
if (!args[i]->isNullable())
{
if (!args[i]->isNullable())
{
result->setNullable(false);
break;
}
result->setNullable(false);
break;
}
}
}
Expand Down Expand Up @@ -1417,13 +1421,12 @@ void makeFirstLastDayResult(DataTypeUtilBase*, const SysFunction*, dsc* result,

result->makeDate();

if (argsCount >= 2)
{
if (args[1]->dsc_dtype == dtype_timestamp)
result->makeTimestamp();
else if (args[1]->dsc_dtype == dtype_timestamp_tz)
result->makeTimestampTz();
}
fb_assert(argsCount >= 2);

if (args[1]->dsc_dtype == dtype_timestamp)
result->makeTimestamp();
else if (args[1]->dsc_dtype == dtype_timestamp_tz)
result->makeTimestampTz();

result->setNullable(isNullable);
}
Expand Down
Loading