Skip to content

Commit 3782f55

Browse files
committed
Cleanup: get rid of req_null
1 parent 41e13db commit 3782f55

31 files changed

+387
-607
lines changed

src/dsql/AggNodes.cpp

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ bool AggNode::aggPass(thread_db* tdbb, Request* request) const
388388
if (arg)
389389
{
390390
desc = EVL_expr(tdbb, request, arg);
391-
if (request->req_flags & req_null)
391+
if (!desc)
392392
return false;
393393

394394
if (distinct)
@@ -597,7 +597,7 @@ void AnyValueAggNode::aggPass(thread_db* tdbb, Request* request, dsc* desc) cons
597597
{
598598
const auto argValue = EVL_expr(tdbb, request, arg);
599599

600-
if (!(request->req_flags & req_null))
600+
if (!argValue)
601601
EVL_make_value(tdbb, argValue, impure);
602602
}
603603

@@ -1037,7 +1037,7 @@ void ListAggNode::aggPass(thread_db* tdbb, Request* request, dsc* desc) const
10371037
{
10381038
const dsc* const delimiterDesc = EVL_expr(tdbb, request, delimiter);
10391039

1040-
if (request->req_flags & req_null)
1040+
if (!delimiterDesc)
10411041
{
10421042
// Mark the result as NULL.
10431043
impure->vlu_desc.dsc_dtype = 0;
@@ -2031,11 +2031,11 @@ bool CorrAggNode::aggPass(thread_db* tdbb, Request* request) const
20312031
dsc* desc2 = NULL;
20322032

20332033
desc = EVL_expr(tdbb, request, arg);
2034-
if (request->req_flags & req_null)
2034+
if (!desc)
20352035
return false;
20362036

20372037
desc2 = EVL_expr(tdbb, request, arg2);
2038-
if (request->req_flags & req_null)
2038+
if (!desc2)
20392039
return false;
20402040

20412041
++impure->vlux_count;
@@ -2307,11 +2307,11 @@ bool RegrAggNode::aggPass(thread_db* tdbb, Request* request) const
23072307
dsc* desc2 = NULL;
23082308

23092309
desc = EVL_expr(tdbb, request, arg);
2310-
if (request->req_flags & req_null)
2310+
if (!desc)
23112311
return false;
23122312

23132313
desc2 = EVL_expr(tdbb, request, arg2);
2314-
if (request->req_flags & req_null)
2314+
if (!desc2)
23152315
return false;
23162316

23172317
++impure->vlux_count;
@@ -2559,12 +2559,10 @@ void RegrCountAggNode::aggInit(thread_db* tdbb, Request* request) const
25592559

25602560
bool RegrCountAggNode::aggPass(thread_db* tdbb, Request* request) const
25612561
{
2562-
EVL_expr(tdbb, request, arg);
2563-
if (request->req_flags & req_null)
2562+
if (!EVL_expr(tdbb, request, arg))
25642563
return false;
25652564

2566-
EVL_expr(tdbb, request, arg2);
2567-
if (request->req_flags & req_null)
2565+
if (!EVL_expr(tdbb, request, arg2))
25682566
return false;
25692567

25702568
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);

0 commit comments

Comments
 (0)