Skip to content

Commit 98f678d

Browse files
asfernandesasfernandes
committed
Rename class jrd_req to Request.
1 parent d39f248 commit 98f678d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+926
-926
lines changed

‎src/dsql/AggNodes.cpp‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ AggNode* AggNode::pass2(thread_db* tdbb, CompilerScratch* csb)
356356
return this;
357357
}
358358

359-
void AggNode::aggInit(thread_db* tdbb, jrd_req* request) const
359+
void AggNode::aggInit(thread_db* tdbb, Request* request) const
360360
{
361361
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
362362
impure->vlux_count = 0;
@@ -378,7 +378,7 @@ void AggNode::aggInit(thread_db* tdbb, jrd_req* request) const
378378
}
379379
}
380380

381-
bool AggNode::aggPass(thread_db* tdbb, jrd_req* request) const
381+
bool AggNode::aggPass(thread_db* tdbb, Request* request) const
382382
{
383383
dsc* desc = NULL;
384384

@@ -435,7 +435,7 @@ bool AggNode::aggPass(thread_db* tdbb, jrd_req* request) const
435435
return true;
436436
}
437437

438-
void AggNode::aggFinish(thread_db* /*tdbb*/, jrd_req* request) const
438+
void AggNode::aggFinish(thread_db* /*tdbb*/, Request* request) const
439439
{
440440
if (asb)
441441
{
@@ -445,7 +445,7 @@ void AggNode::aggFinish(thread_db* /*tdbb*/, jrd_req* request) const
445445
}
446446
}
447447

448-
dsc* AggNode::execute(thread_db* tdbb, jrd_req* request) const
448+
dsc* AggNode::execute(thread_db* tdbb, Request* request) const
449449
{
450450
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
451451

@@ -685,7 +685,7 @@ string AvgAggNode::internalPrint(NodePrinter& printer) const
685685
return "AvgAggNode";
686686
}
687687

688-
void AvgAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
688+
void AvgAggNode::aggInit(thread_db* tdbb, Request* request) const
689689
{
690690
AggNode::aggInit(tdbb, request);
691691

@@ -704,7 +704,7 @@ void AvgAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
704704
}
705705
}
706706

707-
void AvgAggNode::aggPass(thread_db* tdbb, jrd_req* request, dsc* desc) const
707+
void AvgAggNode::aggPass(thread_db* tdbb, Request* request, dsc* desc) const
708708
{
709709
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
710710
if (impure->vlux_count++ == 0) // first call to aggPass()
@@ -720,7 +720,7 @@ void AvgAggNode::aggPass(thread_db* tdbb, jrd_req* request, dsc* desc) const
720720
ArithmeticNode::add2(tdbb, desc, impure, this, blr_add);
721721
}
722722

723-
dsc* AvgAggNode::aggExecute(thread_db* tdbb, jrd_req* request) const
723+
dsc* AvgAggNode::aggExecute(thread_db* tdbb, Request* request) const
724724
{
725725
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
726726

@@ -848,7 +848,7 @@ string ListAggNode::internalPrint(NodePrinter& printer) const
848848
return "ListAggNode";
849849
}
850850

851-
void ListAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
851+
void ListAggNode::aggInit(thread_db* tdbb, Request* request) const
852852
{
853853
AggNode::aggInit(tdbb, request);
854854

@@ -859,7 +859,7 @@ void ListAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
859859
impure->vlu_desc.dsc_dtype = 0;
860860
}
861861

862-
void ListAggNode::aggPass(thread_db* tdbb, jrd_req* request, dsc* desc) const
862+
void ListAggNode::aggPass(thread_db* tdbb, Request* request, dsc* desc) const
863863
{
864864
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
865865

@@ -897,7 +897,7 @@ void ListAggNode::aggPass(thread_db* tdbb, jrd_req* request, dsc* desc) const
897897
impure->vlu_blob->BLB_put_data(tdbb, temp, len);
898898
}
899899

900-
dsc* ListAggNode::aggExecute(thread_db* tdbb, jrd_req* request) const
900+
dsc* ListAggNode::aggExecute(thread_db* tdbb, Request* request) const
901901
{
902902
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
903903

@@ -1000,15 +1000,15 @@ string CountAggNode::internalPrint(NodePrinter& printer) const
10001000
}
10011001

10021002
//// TODO: Improve count(*) in local tables.
1003-
void CountAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
1003+
void CountAggNode::aggInit(thread_db* tdbb, Request* request) const
10041004
{
10051005
AggNode::aggInit(tdbb, request);
10061006

10071007
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
10081008
impure->make_int64(0);
10091009
}
10101010

1011-
void CountAggNode::aggPass(thread_db* /*tdbb*/, jrd_req* request, dsc* /*desc*/) const
1011+
void CountAggNode::aggPass(thread_db* /*tdbb*/, Request* request, dsc* /*desc*/) const
10121012
{
10131013
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
10141014

@@ -1018,7 +1018,7 @@ void CountAggNode::aggPass(thread_db* /*tdbb*/, jrd_req* request, dsc* /*desc*/)
10181018
++impure->vlu_misc.vlu_int64;
10191019
}
10201020

1021-
dsc* CountAggNode::aggExecute(thread_db* /*tdbb*/, jrd_req* request) const
1021+
dsc* CountAggNode::aggExecute(thread_db* /*tdbb*/, Request* request) const
10221022
{
10231023
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
10241024

@@ -1253,7 +1253,7 @@ string SumAggNode::internalPrint(NodePrinter& printer) const
12531253
return "SumAggNode";
12541254
}
12551255

1256-
void SumAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
1256+
void SumAggNode::aggInit(thread_db* tdbb, Request* request) const
12571257
{
12581258
AggNode::aggInit(tdbb, request);
12591259

@@ -1269,7 +1269,7 @@ void SumAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
12691269
}
12701270
}
12711271

1272-
void SumAggNode::aggPass(thread_db* tdbb, jrd_req* request, dsc* desc) const
1272+
void SumAggNode::aggPass(thread_db* tdbb, Request* request, dsc* desc) const
12731273
{
12741274
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
12751275
++impure->vlux_count;
@@ -1280,7 +1280,7 @@ void SumAggNode::aggPass(thread_db* tdbb, jrd_req* request, dsc* desc) const
12801280
ArithmeticNode::add2(tdbb, desc, impure, this, blr_add);
12811281
}
12821282

1283-
dsc* SumAggNode::aggExecute(thread_db* /*tdbb*/, jrd_req* request) const
1283+
dsc* SumAggNode::aggExecute(thread_db* /*tdbb*/, Request* request) const
12841284
{
12851285
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
12861286

@@ -1345,15 +1345,15 @@ string MaxMinAggNode::internalPrint(NodePrinter& printer) const
13451345
return "MaxMinAggNode";
13461346
}
13471347

1348-
void MaxMinAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
1348+
void MaxMinAggNode::aggInit(thread_db* tdbb, Request* request) const
13491349
{
13501350
AggNode::aggInit(tdbb, request);
13511351

13521352
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
13531353
impure->vlu_desc.dsc_dtype = 0;
13541354
}
13551355

1356-
void MaxMinAggNode::aggPass(thread_db* tdbb, jrd_req* request, dsc* desc) const
1356+
void MaxMinAggNode::aggPass(thread_db* tdbb, Request* request, dsc* desc) const
13571357
{
13581358
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
13591359
++impure->vlux_count;
@@ -1370,7 +1370,7 @@ void MaxMinAggNode::aggPass(thread_db* tdbb, jrd_req* request, dsc* desc) const
13701370
EVL_make_value(tdbb, desc, impure);
13711371
}
13721372

1373-
dsc* MaxMinAggNode::aggExecute(thread_db* /*tdbb*/, jrd_req* request) const
1373+
dsc* MaxMinAggNode::aggExecute(thread_db* /*tdbb*/, Request* request) const
13741374
{
13751375
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
13761376

@@ -1472,7 +1472,7 @@ string StdDevAggNode::internalPrint(NodePrinter& printer) const
14721472
return "StdDevAggNode";
14731473
}
14741474

1475-
void StdDevAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
1475+
void StdDevAggNode::aggInit(thread_db* tdbb, Request* request) const
14761476
{
14771477
AggNode::aggInit(tdbb, request);
14781478

@@ -1491,7 +1491,7 @@ void StdDevAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
14911491
}
14921492
}
14931493

1494-
void StdDevAggNode::aggPass(thread_db* tdbb, jrd_req* request, dsc* desc) const
1494+
void StdDevAggNode::aggPass(thread_db* tdbb, Request* request, dsc* desc) const
14951495
{
14961496
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
14971497
++impure->vlux_count;
@@ -1514,7 +1514,7 @@ void StdDevAggNode::aggPass(thread_db* tdbb, jrd_req* request, dsc* desc) const
15141514
}
15151515
}
15161516

1517-
dsc* StdDevAggNode::aggExecute(thread_db* tdbb, jrd_req* request) const
1517+
dsc* StdDevAggNode::aggExecute(thread_db* tdbb, Request* request) const
15181518
{
15191519
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
15201520
StdDevImpure* impure2 = request->getImpure<StdDevImpure>(impure2Offset);
@@ -1681,7 +1681,7 @@ string CorrAggNode::internalPrint(NodePrinter& printer) const
16811681
return "CorrAggNode";
16821682
}
16831683

1684-
void CorrAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
1684+
void CorrAggNode::aggInit(thread_db* tdbb, Request* request) const
16851685
{
16861686
AggNode::aggInit(tdbb, request);
16871687

@@ -1700,7 +1700,7 @@ void CorrAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
17001700
}
17011701
}
17021702

1703-
bool CorrAggNode::aggPass(thread_db* tdbb, jrd_req* request) const
1703+
bool CorrAggNode::aggPass(thread_db* tdbb, Request* request) const
17041704
{
17051705
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
17061706

@@ -1744,12 +1744,12 @@ bool CorrAggNode::aggPass(thread_db* tdbb, jrd_req* request) const
17441744
return true;
17451745
}
17461746

1747-
void CorrAggNode::aggPass(thread_db* /*tdbb*/, jrd_req* /*request*/, dsc* /*desc*/) const
1747+
void CorrAggNode::aggPass(thread_db* /*tdbb*/, Request* /*request*/, dsc* /*desc*/) const
17481748
{
17491749
fb_assert(false);
17501750
}
17511751

1752-
dsc* CorrAggNode::aggExecute(thread_db* tdbb, jrd_req* request) const
1752+
dsc* CorrAggNode::aggExecute(thread_db* tdbb, Request* request) const
17531753
{
17541754
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
17551755
CorrImpure* impure2 = request->getImpure<CorrImpure>(impure2Offset);
@@ -1957,7 +1957,7 @@ string RegrAggNode::internalPrint(NodePrinter& printer) const
19571957
return "RegrAggNode";
19581958
}
19591959

1960-
void RegrAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
1960+
void RegrAggNode::aggInit(thread_db* tdbb, Request* request) const
19611961
{
19621962
AggNode::aggInit(tdbb, request);
19631963

@@ -1976,7 +1976,7 @@ void RegrAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
19761976
}
19771977
}
19781978

1979-
bool RegrAggNode::aggPass(thread_db* tdbb, jrd_req* request) const
1979+
bool RegrAggNode::aggPass(thread_db* tdbb, Request* request) const
19801980
{
19811981
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
19821982

@@ -2021,12 +2021,12 @@ bool RegrAggNode::aggPass(thread_db* tdbb, jrd_req* request) const
20212021
return true;
20222022
}
20232023

2024-
void RegrAggNode::aggPass(thread_db* /*tdbb*/, jrd_req* /*request*/, dsc* /*desc*/) const
2024+
void RegrAggNode::aggPass(thread_db* /*tdbb*/, Request* /*request*/, dsc* /*desc*/) const
20252025
{
20262026
fb_assert(false);
20272027
}
20282028

2029-
dsc* RegrAggNode::aggExecute(thread_db* tdbb, jrd_req* request) const
2029+
dsc* RegrAggNode::aggExecute(thread_db* tdbb, Request* request) const
20302030
{
20312031
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
20322032

@@ -2226,15 +2226,15 @@ string RegrCountAggNode::internalPrint(NodePrinter& printer) const
22262226
return "RegrCountAggNode";
22272227
}
22282228

2229-
void RegrCountAggNode::aggInit(thread_db* tdbb, jrd_req* request) const
2229+
void RegrCountAggNode::aggInit(thread_db* tdbb, Request* request) const
22302230
{
22312231
AggNode::aggInit(tdbb, request);
22322232

22332233
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
22342234
impure->make_int64(0);
22352235
}
22362236

2237-
bool RegrCountAggNode::aggPass(thread_db* tdbb, jrd_req* request) const
2237+
bool RegrCountAggNode::aggPass(thread_db* tdbb, Request* request) const
22382238
{
22392239
EVL_expr(tdbb, request, arg);
22402240
if (request->req_flags & req_null)
@@ -2250,12 +2250,12 @@ bool RegrCountAggNode::aggPass(thread_db* tdbb, jrd_req* request) const
22502250
return true;
22512251
}
22522252

2253-
void RegrCountAggNode::aggPass(thread_db* /*tdbb*/, jrd_req* /*request*/, dsc* /*desc*/) const
2253+
void RegrCountAggNode::aggPass(thread_db* /*tdbb*/, Request* /*request*/, dsc* /*desc*/) const
22542254
{
22552255
fb_assert(false);
22562256
}
22572257

2258-
dsc* RegrCountAggNode::aggExecute(thread_db* tdbb, jrd_req* request) const
2258+
dsc* RegrCountAggNode::aggExecute(thread_db* tdbb, Request* request) const
22592259
{
22602260
impure_value_ex* impure = request->getImpure<impure_value_ex>(impureOffset);
22612261

0 commit comments

Comments
 (0)