constexpr StatementMetadata

Author: mrotteveel

src/common/StatementMetadata.cpp

@@ -34,7 +34,7 @@
 namespace Firebird {
 
 
-static const UCHAR DESCRIBE_VARS[] =
+static constexpr UCHAR DESCRIBE_VARS[] =
 {
 	isc_info_sql_describe_vars,
 	isc_info_sql_sqlda_seq,
@@ -50,7 +50,7 @@ static const UCHAR DESCRIBE_VARS[] =
 	isc_info_sql_describe_end
 };
 
-static const unsigned INFO_BUFFER_SIZE = MemoryPool::MAX_MEDIUM_BLOCK_SIZE;
+static constexpr unsigned INFO_BUFFER_SIZE = MemoryPool::MAX_MEDIUM_BLOCK_SIZE;
 
 
 static USHORT getLen(const UCHAR** ptr, const UCHAR* bufferEnd);
@@ -93,7 +93,7 @@ unsigned StatementMetadata::buildInfoItems(Array<UCHAR>& items, unsigned flags)
 }
 
 // Build a prepare flags bitmask based on a list of info codes.
-unsigned StatementMetadata::buildInfoFlags(unsigned itemsLength, const UCHAR* items)
+unsigned StatementMetadata::buildInfoFlags(unsigned itemsLength, const UCHAR* items) noexcept
 {
 	unsigned flags = 0;
 	const UCHAR* end = items + itemsLength;
@@ -137,7 +137,7 @@ unsigned StatementMetadata::getType()
 {
 	if (!type.has_value())
 	{
-		UCHAR info[] = {isc_info_sql_stmt_type};
+		constexpr UCHAR info[] = {isc_info_sql_stmt_type};
 		UCHAR result[16];
 
 		getAndParse(sizeof(info), info, sizeof(result), result);
@@ -152,7 +152,7 @@ unsigned StatementMetadata::getFlags()
 {
 	if (!flags.has_value())
 	{
-		UCHAR info[] = {isc_info_sql_stmt_flags};
+		constexpr UCHAR info[] = {isc_info_sql_stmt_flags};
 		UCHAR result[16];
 
 		getAndParse(sizeof(info), info, sizeof(result), result);
@@ -166,11 +166,11 @@ unsigned StatementMetadata::getFlags()
 // Get statement plan.
 const char* StatementMetadata::getPlan(bool detailed)
 {
-	string* plan = detailed ? &detailedPlan : &legacyPlan;
+	const string* plan = detailed ? &detailedPlan : &legacyPlan;
 
 	if (plan->isEmpty())
 	{
-		UCHAR info[] = {UCHAR(detailed ? isc_info_sql_explain_plan : isc_info_sql_get_plan)};
+		const UCHAR info[] = {UCHAR(detailed ? isc_info_sql_explain_plan : isc_info_sql_get_plan)};
 		UCHAR result[INFO_BUFFER_SIZE];
 
 		getAndParse(sizeof(info), info, sizeof(result), result);
@@ -202,7 +202,7 @@ IMessageMetadata* StatementMetadata::getOutputMetadata()
 // Get number of records affected by the statement execution.
 ISC_UINT64 StatementMetadata::getAffectedRecords()
 {
-	UCHAR info[] = {isc_info_sql_records};
+	constexpr UCHAR info[] = {isc_info_sql_records};
 	UCHAR result[33];
 
 	getAndParse(sizeof(info), info, sizeof(result), result);
@@ -215,7 +215,7 @@ ISC_UINT64 StatementMetadata::getAffectedRecords()
 
 		while (*p != isc_info_end)
 		{
-			UCHAR counter = *p++;
+			const UCHAR counter = *p++;
 			const SSHORT len = gds__vax_integer(p, 2);
 			p += 2;
 			if (counter != isc_info_req_select_count)
@@ -308,7 +308,7 @@ void StatementMetadata::parse(unsigned bufferLength, const UCHAR* buffer)
 						case isc_info_sql_sqlda_seq:
 							if (!parameters->fetched)
 							{
-								unsigned num = getNumericInfo(&buffer, bufferEnd);
+								const unsigned num = getNumericInfo(&buffer, bufferEnd);
 
 								while (parameters->items.getCount() < num)
 									parameters->items.add();
@@ -379,7 +379,7 @@ void StatementMetadata::parse(unsigned bufferLength, const UCHAR* buffer)
 
 							for (unsigned n = 0; n < parameters->items.getCount(); ++n)
 							{
-								Parameters::Item* param = &parameters->items[n];
+								const Parameters::Item* param = &parameters->items[n];
 
 								if (!param->finished)
 								{
@@ -532,7 +532,7 @@ static USHORT getLen(const UCHAR** ptr, const UCHAR* bufferEnd)
 static int getNumericInfo(const UCHAR** ptr, const UCHAR* bufferEnd)
 {
 	const USHORT len = getLen(ptr, bufferEnd);
-	int item = gds__vax_integer(*ptr, len);
+	const int item = gds__vax_integer(*ptr, len);
 	*ptr += len;
 	return item;
 }

src/common/StatementMetadata.h

@@ -63,7 +63,7 @@ class StatementMetadata : public PermanentStorage
 	}
 
 	static unsigned buildInfoItems(Array<UCHAR>& items, unsigned flags);
-	static unsigned buildInfoFlags(unsigned itemsLength, const UCHAR* items);
+	static unsigned buildInfoFlags(unsigned itemsLength, const UCHAR* items) noexcept;
 
 	unsigned getType();
 	unsigned getFlags();