Merge branch 'firebird_master' into port2firebird_tablespaces2

Author: Alexander Zhdanov

doc/sql.extensions/README.packages.txt

@@ -28,7 +28,7 @@ Syntax:
         PROCEDURE <name> [( <parameters> ) [RETURNS ( <parameters> )]]
 
     <package_body> ::=
-        { CREATE | RECREATE } PACKAGE BODY <name>
+        { CREATE [OR ALTER] | ALTER | RECREATE } PACKAGE BODY <name>
         AS
         BEGIN
             [ <package_item> ... ]

src/common/tests/CvtTestUtils.h

@@ -122,7 +122,7 @@ class MockCallback : public Firebird::Callbacks
 		return m_mockGetLocalDateFunc();
 	}
 
-	ISC_TIMESTAMP getCurrentGmtTimeStamp() override { ISC_TIMESTAMP ts; return ts; }
+	ISC_TIMESTAMP getCurrentGmtTimeStamp() override { return {0, 0}; }
 	USHORT getSessionTimeZone() override { return 1439; } // 1439 is ONE_DAY, so we have no offset
 	void isVersion4(bool& v4) override { }
 

src/common/utils_proto.h

@@ -31,10 +31,13 @@
 
 #include <cctype>
 #include <string.h>
+#include <type_traits>
+
 #include "../common/classes/fb_string.h"
 #include "../common/classes/array.h"
 #include "iberror.h"
 #include "firebird/Interface.h"
+#include "memory_routines.h"
 
 #ifdef SFIO
 #include <stdio.h>
@@ -271,6 +274,51 @@ namespace fb_utils
 	// Frequently used actions with clumplets
 	bool isBpbSegmented(unsigned parLength, const unsigned char* par);
 
+
+	// Workaround, to be removed with C++ 23
+	template <typename... T>
+	constexpr bool fb_always_false_v = false;
+
+	// Put integer value into info buffer
+	template<typename T>
+	inline unsigned char* putInfoItemInt(const unsigned char item, T value,
+		unsigned char* ptr, const unsigned char* end)
+	{
+		static_assert(std::is_integral_v<T>, "Integral type expected");
+
+		constexpr auto len = sizeof(T);
+
+		if (ptr + len + 1 + 2 > end)
+		{
+			if (ptr < end)
+			{
+				*ptr++ = isc_info_truncated;
+				if (ptr < end)
+					*ptr++ = isc_info_end;
+			}
+			return nullptr;
+		}
+
+		*ptr++ = item;
+		*ptr++ = len;
+		*ptr++ = 0;
+
+		if constexpr (len == sizeof(SINT64))
+			put_vax_int64(ptr, value);
+		else if constexpr (len == sizeof(SLONG))
+			put_vax_long(ptr, value);
+		else if constexpr (len == sizeof(SSHORT))
+			put_vax_short(ptr, value);
+		else if constexpr (len == sizeof(char))
+			*ptr = value;
+		else
+			static_assert(fb_always_false_v<T>, "unknown data type");
+
+		ptr += len;
+		return ptr;
+	}
+
+
 	// RAII to call fb_shutdown() in utilities
 	class FbShutdown
 	{

src/dsql/parse.y

@@ -1732,6 +1732,7 @@ replace_clause
 	| FUNCTION replace_function_clause			{ $$ = $2; }
 	| TRIGGER replace_trigger_clause			{ $$ = $2; }
 	| PACKAGE replace_package_clause			{ $$ = $2; }
+	| PACKAGE BODY replace_package_body_clause	{ $$ = $3; }
 	| VIEW replace_view_clause					{ $$ = $2; }
 	| EXCEPTION replace_exception_clause		{ $$ = $2; }
 	| GENERATOR replace_sequence_clause			{ $$ = $2; }
@@ -3264,6 +3265,12 @@ package_body_item
 	;
 
 
+%type <ddlNode> replace_package_body_clause
+replace_package_body_clause
+	: package_body_clause
+		{ $$ = newNode<RecreatePackageBodyNode>($1); }
+	;
+
 %type <localDeclarationsNode> local_declarations_opt
 local_declarations_opt
 	: local_forward_declarations_opt local_nonforward_declarations_opt
@@ -4333,6 +4340,7 @@ alter_clause
 	| TRIGGER alter_trigger_clause			{ $$ = $2; }
 	| PROCEDURE alter_procedure_clause		{ $$ = $2; }
 	| PACKAGE alter_package_clause			{ $$ = $2; }
+	| PACKAGE BODY replace_package_body_clause	{ $$ = $3; }
 	| DATABASE
 			{ $<alterDatabaseNode>$ = newNode<AlterDatabaseNode>(); }
 		alter_db($<alterDatabaseNode>2)

src/jrd/Monitoring.cpp

@@ -507,7 +507,10 @@ MonitoringSnapshot::MonitoringSnapshot(thread_db* tdbb, MemoryPool& pool)
 		if (LCK_lock(tdbb, lock, LCK_EX, LCK_NO_WAIT))
 		{
 			LCK_release(tdbb, lock);
+
+			MonitoringData::Guard guard(dbb->dbb_monitoring_data);
 			dbb->dbb_monitoring_data->cleanup(attId);
+
 			continue;
 		}
 
@@ -541,7 +544,6 @@ MonitoringSnapshot::MonitoringSnapshot(thread_db* tdbb, MemoryPool& pool)
 	{ // scope for the guard
 
 		MonitoringData::Guard guard(dbb->dbb_monitoring_data);
-
 		dbb->dbb_monitoring_data->read(userNamePtr, temp_space);
 	}
 

src/jrd/SysFunction.cpp

@@ -396,6 +396,7 @@ const char
 	CLIENT_VERSION_NAME[] = "CLIENT_VERSION",
 	CURRENT_USER_NAME[] = "CURRENT_USER",
 	CURRENT_ROLE_NAME[] = "CURRENT_ROLE",
+	SERVER_PID_NAME[] = "SERVER_PID",
 	SESSION_IDLE_TIMEOUT[] = "SESSION_IDLE_TIMEOUT",
 	STATEMENT_TIMEOUT[] = "STATEMENT_TIMEOUT",
 	EFFECTIVE_USER_NAME[] = "EFFECTIVE_USER",
@@ -4709,6 +4710,8 @@ dsc* evlGetContext(thread_db* tdbb, const SysFunction*, const NestValueArray& ar
 
 			resultStr = role.c_str();
 		}
+		else if (nameStr == SERVER_PID_NAME)
+			resultStr.printf("%d", getpid());
 		else if (nameStr == SESSION_IDLE_TIMEOUT)
 			resultStr.printf("%" ULONGFORMAT, attachment->getIdleTimeout());
 		else if (nameStr == STATEMENT_TIMEOUT)
@@ -5467,19 +5470,22 @@ dsc* evlMakeDbkey(Jrd::thread_db* tdbb, const SysFunction* function, const NestV
 
 
 dsc* evlMaxMinValue(thread_db* tdbb, const SysFunction* function, const NestValueArray& args,
-	impure_value*)
+	impure_value* impure)
 {
 	fb_assert(args.getCount() >= 1);
 	fb_assert(function->misc != NULL);
 
-	Request* request = tdbb->getRequest();
-	dsc* result = NULL;
+	const auto request = tdbb->getRequest();
+	HalfStaticArray<const dsc*, 2> argTypes(args.getCount());
+	dsc* result = nullptr;
 
 	for (FB_SIZE_T i = 0; i < args.getCount(); ++i)
 	{
-		dsc* value = EVL_expr(tdbb, request, args[i]);
+		const auto value = EVL_expr(tdbb, request, args[i]);
 		if (request->req_flags & req_null)	// return NULL if value is NULL
-			return NULL;
+			return nullptr;
+
+		argTypes.add(value);
 
 		if (i == 0)
 			result = value;
@@ -5503,7 +5509,12 @@ dsc* evlMaxMinValue(thread_db* tdbb, const SysFunction* function, const NestValu
 		}
 	}
 
-	return result;
+	DataTypeUtil(tdbb).makeFromList(&impure->vlu_desc, function->name, argTypes.getCount(), argTypes.begin());
+	impure->vlu_desc.dsc_address = (UCHAR*) &impure->vlu_misc;
+
+	MOV_move(tdbb, result, &impure->vlu_desc);
+
+	return &impure->vlu_desc;
 }
 
 

src/jrd/btr.cpp

@@ -769,7 +769,10 @@ void IndexScanListIterator::makeKeys(thread_db* tdbb, temporary_key* lower, temp
 	m_upperValues[m_segno] = *m_iterator;
 
 	const auto keyType =
-		(m_retrieval->irb_desc.idx_flags & idx_unique) ? INTL_KEY_UNIQUE : INTL_KEY_SORT;
+		(m_retrieval->irb_generic & irb_multi_starting) ? INTL_KEY_MULTI_STARTING :
+		(m_retrieval->irb_generic & irb_starting) ? INTL_KEY_PARTIAL :
+		(m_retrieval->irb_desc.idx_flags & idx_unique) ? INTL_KEY_UNIQUE :
+		INTL_KEY_SORT;
 
 	// Make the lower bound key
 
@@ -6947,7 +6950,7 @@ static bool scan(thread_db* tdbb, UCHAR* pointer, RecordBitmap** bitmap, RecordB
 	const bool partUpper = (retrieval->irb_upper_count < idx->idx_count);
 
 	// Reset flags this routine does not check in the loop below
-	flag &= ~(irb_equality | irb_ignore_null_value_key | irb_root_list_scan);
+	flag &= ~(irb_equality | irb_unique | irb_ignore_null_value_key | irb_root_list_scan);
 	flag &= ~(irb_exclude_lower | irb_exclude_upper);
 
 	IndexNode node;

src/jrd/btr.h

@@ -239,6 +239,7 @@ const int irb_exclude_lower	= 32;			// exclude lower bound keys while scanning i
 const int irb_exclude_upper	= 64;			// exclude upper bound keys while scanning index
 const int irb_multi_starting	= 128;		// Use INTL_KEY_MULTI_STARTING
 const int irb_root_list_scan	= 256;		// Locate list items from the root
+const int irb_unique	= 512;				// Unique match (currently used only for plan output)
 
 // Force include flags - always include appropriate key while scanning index
 const int irb_force_lower	= irb_exclude_lower;

src/jrd/build_no.h

@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:511
+  FORMAL BUILD NUMBER:523
 */
 
-#define PRODUCT_VER_STRING "6.0.0.511"
-#define FILE_VER_STRING "WI-T6.0.0.511"
-#define LICENSE_VER_STRING "WI-T6.0.0.511"
-#define FILE_VER_NUMBER 6, 0, 0, 511
+#define PRODUCT_VER_STRING "6.0.0.523"
+#define FILE_VER_STRING "WI-T6.0.0.523"
+#define LICENSE_VER_STRING "WI-T6.0.0.523"
+#define FILE_VER_NUMBER 6, 0, 0, 523
 #define FB_MAJOR_VER "6"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "511"
+#define FB_BUILD_NO "523"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 6.0 Initial"

src/jrd/optimizer/Optimizer.cpp

@@ -1971,14 +1971,15 @@ void Optimizer::checkSorts()
 
 unsigned Optimizer::distributeEqualities(BoolExprNodeStack& orgStack, unsigned baseCount)
 {
-	// dimitr:	Dumb protection against too many injected conjuncts (see CORE-5381).
-	//			Don't produce more additional conjuncts than we originally had
-	//			(i.e. this routine should never more than double the number of conjuncts).
-	//			Ideally, we need two separate limits here:
-	//				1) number of injected conjuncts (affects required impure size)
-	//				2) number of input conjuncts (affects search time inside this routine)
-
-	if (baseCount * 2 > MAX_CONJUNCTS)
+	// dimitr:	Simplified protection against too many injected conjuncts (see CORE-5381).
+	//			Two separate limits are applied here:
+	//				1) number of input conjuncts (affects search time inside this routine)
+	//				2) number of injected conjuncts (affects required impure size)
+
+	constexpr unsigned MAX_CONJUNCTS_TO_PROCESS = 1024;
+	const unsigned MAX_CONJUNCTS_TO_INJECT = MAX(baseCount, 256);
+
+	if (baseCount > MAX_CONJUNCTS_TO_PROCESS)
 		return 0;
 
 	ObjectsArray<ValueExprNodeStack> classes;