Port logic improvements: date calculation, DSQL validation, and sort merge logic

laBobberto · laBobberto · commit 61e555a787c6 · 2026-04-03T00:30:21.000+03:00
diff --git a/src/common/classes/NoThrowTimeStamp.cpp b/src/common/classes/NoThrowTimeStamp.cpp
@@ -52,7 +52,7 @@ const ISC_TIME NoThrowTimeStamp::POW_10_TABLE[] =
 NoThrowTimeStamp NoThrowTimeStamp::getCurrentTimeStamp(const char** error) noexcept
 {
 	if (error)
-		*error = NULL;
+		*error = nullptr;
 	NoThrowTimeStamp result;
 
 	// NS: We round generated timestamps to whole millisecond.
@@ -341,51 +341,36 @@ int NoThrowTimeStamp::convertGregorianDateToWeekDate(const struct tm& times) noe
 {
 	// Algorithm for Converting Gregorian Dates to ISO 8601 Week Date by Rick McCarty, 1999
 	// http://personal.ecu.edu/mccartyr/ISOwdALG.txt
-
 	const int y = times.tm_year + 1900;
-	const int dayOfYearNumber = times.tm_yday + 1;
+	const int dayOfYear = times.tm_yday + 1;
 
 	// Find the jan1Weekday for y (Monday=1, Sunday=7)
-	const int yy = (y - 1) % 100;
-	const int c = (y - 1) - yy;
-	const int g = yy + yy / 4;
+	const int y_1 = y - 1;
+	const int yy = y_1 % 100;
+	const int c = y_1 - yy;
+	const int g = yy + (yy / 4);
 	const int jan1Weekday = 1 + (((((c / 100) % 4) * 5) + g) % 7);
 
-	// Find the weekday for y m d
-	const int h = dayOfYearNumber + (jan1Weekday - 1);
-	const int weekday = 1 + ((h - 1) % 7);
+	const int weekday = 1 + ((dayOfYear + jan1Weekday - 2) % 7);
 
 	// Find if y m d falls in yearNumber y-1, weekNumber 52 or 53
-	int yearNumber, weekNumber;
-
-	if ((dayOfYearNumber <= (8 - jan1Weekday)) && (jan1Weekday > 4))
+	if ((dayOfYear <= (8 - jan1Weekday)) & (jan1Weekday > 4))
 	{
-		yearNumber = y - 1;
-		weekNumber = ((jan1Weekday == 5) || ((jan1Weekday == 6) &&
-			isLeapYear(yearNumber))) ? 53 : 52;
+		const int prevYearLeap = (!(y_1 % 4) && ((y_1 % 100) || !(y_1 % 400)));
+		const int is53 = (jan1Weekday == 5) | ((jan1Weekday == 6) & prevYearLeap);
+		return 52 + is53;
 	}
-	else
-	{
-		yearNumber = y;
 
-		// Find if y m d falls in yearNumber y+1, weekNumber 1
-		const int i = isLeapYear(y) ? 366 : 365;
-
-		if ((i - dayOfYearNumber) < (4 - weekday))
-		{
-			yearNumber = y + 1;
-			weekNumber = 1;
-		}
+	// Find if y m d falls in yearNumber y+1, weekNumber 1
+	const int daysInYear = 365 + (!(y % 4) && ((y % 100) || !(y % 400)));
+	if ((daysInYear - dayOfYear) < (4 - weekday))
+	{
+		return 1;
 	}
 
 	// Find if y m d falls in yearNumber y, weekNumber 1 through 53
-	if (yearNumber == y)
-	{
-		const int j = dayOfYearNumber + (7 - weekday) + (jan1Weekday - 1);
-		weekNumber = j / 7;
-		if (jan1Weekday > 4)
-			weekNumber--;
-	}
+	const int j = dayOfYear + (7 - weekday) + (jan1Weekday - 1);
+	const int weekNumber = (j / 7) - (jan1Weekday > 4); // Subtract 1 if jan1Weekday > 4
 
 	return weekNumber;
 }
diff --git a/src/dsql/StmtNodes.cpp b/src/dsql/StmtNodes.cpp
@@ -521,7 +521,7 @@ BlockNode* BlockNode::pass2(thread_db* tdbb, CompilerScratch* csb)
 const StmtNode* BlockNode::execute(thread_db* tdbb, Request* request, ExeState* exeState) const
 {
 	jrd_tra* transaction = request->req_transaction;
-	SavNumber savNumber;
+	SavNumber savNumber = 0;
 
 	switch (request->req_operation)
 	{
@@ -2473,9 +2473,9 @@ void EraseNode::pass1Erase(thread_db* tdbb, CompilerScratch* csb, EraseNode* nod
 	// To support nested views, loop until we hit a table or a view with user-defined triggers
 	// (which means no update).
 
-	jrd_rel* parent = NULL;
-	jrd_rel* view = NULL;
-	StreamType parentStream;
+	jrd_rel* parent = nullptr;
+	jrd_rel* view = nullptr;
+	StreamType parentStream = 0;
 
 	for (;;)
 	{
@@ -5067,8 +5067,6 @@ void ExecBlockNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 	// Sub routine doesn't need ports and should generate BLR as declared in its metadata.
 	const bool subRoutine = dsqlScratch->flags & DsqlCompilerScratch::FLAG_SUB_ROUTINE;
 
-	unsigned returnsPos;
-
 	if (!subRoutine)
 	{
 		// Now do the input parameters.
@@ -5080,8 +5078,6 @@ void ExecBlockNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 				dsql_var::TYPE_INPUT, 0, (USHORT) (2 * i), i);
 		}
 
-		returnsPos = dsqlScratch->variables.getCount();
-
 		// Now do the output parameters.
 		for (FB_SIZE_T i = 0; i < returns.getCount(); ++i)
 		{
@@ -5130,7 +5126,6 @@ void ExecBlockNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 	if (subRoutine)
 	{
 		dsqlScratch->genParameters(parameters, returns);
-		returnsPos = dsqlScratch->variables.getCount() - dsqlScratch->outputVariables.getCount();
 	}
 
 	if (parameters.hasData())
@@ -5145,6 +5140,8 @@ void ExecBlockNode::genBlr(DsqlCompilerScratch* dsqlScratch)
 	{
 		// This validation is needed only for subroutines. Standard EXECUTE BLOCK moves input
 		// parameters to variables and are then validated.
+		// Number of input parameters to validate (total variables minus output variables)
+		const unsigned returnsPos = dsqlScratch->variables.getCount() - dsqlScratch->outputVariables.getCount();
 
 		for (unsigned i = 0; i < returnsPos; ++i)
 		{
@@ -7992,9 +7989,9 @@ void ModifyNode::pass1Modify(thread_db* tdbb, CompilerScratch* csb, ModifyNode*
 	if (node->subMod)
 		return;
 
-	jrd_rel* parent = NULL;
-	jrd_rel* view = NULL;
-	StreamType parentStream, parentNewStream;
+	jrd_rel* parent = nullptr;
+	jrd_rel* view = nullptr;
+	StreamType parentStream = 0, parentNewStream = 0;
 
 	// To support nested views, loop until we hit a table or a view with user-defined triggers
 	// (which means no update).
@@ -9042,9 +9039,9 @@ bool StoreNode::pass1Store(thread_db* tdbb, CompilerScratch* csb, StoreNode* nod
 		return false;
 	}
 
-	jrd_rel* parent = NULL;
-	jrd_rel* view = NULL;
-	StreamType parentStream;
+	jrd_rel* parent = nullptr;
+	jrd_rel* view = nullptr;
+	StreamType parentStream = 0;
 
 	// To support nested views, loop until we hit a table or a view with user-defined triggers
 	// (which means no update).
@@ -12195,7 +12192,7 @@ static void validateExpressions(thread_db* tdbb, const Array<ValidateInfo>& vali
 		if (!i->boolean->execute(tdbb, request) && !(request->req_flags & req_null))
 		{
 			// Validation error -- report result
-			const char* value;
+			const char* value = nullptr;
 			VaryStr<TEMP_STR_LENGTH> temp;
 
 			const dsc* desc = EVL_expr(tdbb, request, i->value);
@@ -12207,6 +12204,7 @@ static void validateExpressions(thread_db* tdbb, const Array<ValidateInfo>& vali
 			else if (!length)
 				value = "";
 			else
+				fb_assert(value);
 				const_cast<char*>(value)[length] = 0;	// safe cast - data is actually on the stack
 
 			string name;
diff --git a/src/jrd/sort.cpp b/src/jrd/sort.cpp
@@ -417,7 +417,6 @@ void Sort::sort(thread_db* tdbb)
  **************************************/
 	run_control* run;
 	merge_control* merge;
-	merge_control* merge_pool;
 
 	try
 	{
@@ -488,15 +487,8 @@ void Sort::sort(thread_db* tdbb)
 		{
 			fb_assert(!m_merge_pool);	// shouldn't have a pool
 			m_merge_pool = FB_NEW_POOL(m_owner->getPool()) merge_control[count - 1];
-			merge_pool = m_merge_pool;
+			merge_control* merge_pool = m_merge_pool;
 			memset(merge_pool, 0, (count - 1) * sizeof(merge_control));
-		}
-		else
-		{
-			// Merge of 1 or 0 runs doesn't make sense
-			fb_assert(false);				// We really shouldn't get here
-			merge = (merge_control*) *streams;	// But if we do...
-		}
 
 		// Each pass through the vector builds a level of the merge tree
 		// by condensing two runs into one.
@@ -528,16 +520,23 @@ void Sort::sort(thread_db* tdbb)
 				(*m1)->rmh_parent = merge;
 				merge->mrg_stream_b = *m1++;
 
-				merge->mrg_record_a = NULL;
-				merge->mrg_record_b = NULL;
+				merge->mrg_record_a = nullptr;
+				merge->mrg_record_b = nullptr;
 
 				*m2++ = (run_merge_hdr*) merge;
 				count -= 2;
 			}
 
 			if (count)
-				*m2++ = *m1++;
-			count = m2 - streams;
+					*m2++ = *m1++;
+				count = m2 - streams;
+			}
+		}
+		else
+		{
+			// Merge of 1 or 0 runs doesn't make sense
+			fb_assert(false);				// We really shouldn't get here
+			merge = (merge_control*) *streams;	// But if we do...
 		}
 
 		streams.reset();
@@ -1272,7 +1271,7 @@ sort_record* Sort::getMerge(merge_control* merge)
 			}
 			else if ( (record = merge->mrg_record_a) )
 			{
-				merge->mrg_record_a = NULL;
+				merge->mrg_record_a = nullptr;
 				merge = merge->mrg_header.rmh_parent;
 			}
 			else
@@ -1287,7 +1286,7 @@ sort_record* Sort::getMerge(merge_control* merge)
 		if (!merge->mrg_record_a)
 		{
 			record = merge->mrg_record_b;
-			merge->mrg_record_b = NULL;
+			merge->mrg_record_b = nullptr;
 			merge = merge->mrg_header.rmh_parent;
 			continue;
 		}
@@ -1311,7 +1310,7 @@ sort_record* Sort::getMerge(merge_control* merge)
 										  (const UCHAR*) merge->mrg_record_b,
 										  m_dup_callback_arg))
 			{
-				merge->mrg_record_a = NULL;
+				merge->mrg_record_a = nullptr;
 				diddleKey((UCHAR*) merge->mrg_record_b, true, true);
 				continue;
 			}
@@ -1330,12 +1329,12 @@ sort_record* Sort::getMerge(merge_control* merge)
 		if (p[-1] < q[-1])
 		{
 			record = merge->mrg_record_a;
-			merge->mrg_record_a = NULL;
+			merge->mrg_record_a = nullptr;
 		}
 		else
 		{
 			record = merge->mrg_record_b;
-			merge->mrg_record_b = NULL;
+			merge->mrg_record_b = nullptr;
 		}
 
 		merge = merge->mrg_header.rmh_parent;
@@ -1619,8 +1618,8 @@ void Sort::mergeRuns(USHORT n)
 			(*m1)->rmh_parent = merge;
 			merge->mrg_stream_b = *m1++;
 
-			merge->mrg_record_a = NULL;
-			merge->mrg_record_b = NULL;
+			merge->mrg_record_a = nullptr;
+			merge->mrg_record_b = nullptr;
 			*m2++ = (run_merge_hdr*) merge;
 			merge++;
 			count -= 2;
@@ -2267,8 +2266,8 @@ void PartitionedSort::buildMergeTree()
 			(*m1)->rmh_parent = m_merge;
 			m_merge->mrg_stream_b = *m1++;
 
-			m_merge->mrg_record_a = NULL;
-			m_merge->mrg_record_b = NULL;
+			m_merge->mrg_record_a = nullptr;
+			m_merge->mrg_record_b = nullptr;
 
 			*m2++ = (run_merge_hdr*)m_merge;
 			count -= 2;
@@ -2366,7 +2365,7 @@ sort_record* PartitionedSort::getMerge()
 			}
 			else if ((record = merge->mrg_record_a))
 			{
-				merge->mrg_record_a = NULL;
+				merge->mrg_record_a = nullptr;
 				merge = merge->mrg_header.rmh_parent;
 			}
 			else
@@ -2381,7 +2380,7 @@ sort_record* PartitionedSort::getMerge()
 		if (!merge->mrg_record_a)
 		{
 			record = merge->mrg_record_b;
-			merge->mrg_record_b = NULL;
+			merge->mrg_record_b = nullptr;
 			merge = merge->mrg_header.rmh_parent;
 			continue;
 		}
@@ -2408,7 +2407,7 @@ sort_record* PartitionedSort::getMerge()
 				(const UCHAR*)merge->mrg_record_b,
 				aSort->m_dup_callback_arg))
 			{
-				merge->mrg_record_a = NULL;
+				merge->mrg_record_a = nullptr;
 				aSort->diddleKey(rec_b, true, true);
 				continue;
 			}
@@ -2426,12 +2425,12 @@ sort_record* PartitionedSort::getMerge()
 		if (p[-1] < q[-1])
 		{
 			record = merge->mrg_record_a;
-			merge->mrg_record_a = NULL;
+			merge->mrg_record_a = nullptr;
 		}
 		else
 		{
 			record = merge->mrg_record_b;
-			merge->mrg_record_b = NULL;
+			merge->mrg_record_b = nullptr;
 		}
 
 		merge = merge->mrg_header.rmh_parent;
