Support for isc_info_active_tran_count (and refactoring). (#986)

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscCodes.cs

@@ -391,7 +391,7 @@ internal static class IscCodes
 		public const int isc_action_svc_remove_license = 10;    /* Removes a license from the license file */
 		public const int isc_action_svc_db_stats = 11;  /* Retrieves database statistics */
 		public const int isc_action_svc_get_ib_log = 12;    /* Retrieves the InterBase log file	from the server	*/
-		public const int isc_action_svc_get_fb_log = 12;	/* Retrieves the Firebird log file from the server */
+		public const int isc_action_svc_get_fb_log = 12;    /* Retrieves the Firebird log file from the server */
 		public const int isc_action_svc_nbak = 20;  /* Incremental nbackup */
 		public const int isc_action_svc_nrest = 21; /* Incremental database restore */
 		public const int isc_action_svc_trace_start = 22;   // Start trace session
@@ -742,8 +742,6 @@ internal static class IscCodes
 		public const int isc_info_db_read_only = 63;
 		public const int isc_info_db_size_in_pages = 64;
 
-		/* Values 65 -100 unused to	avoid conflict with	InterBase */
-
 		public const int frb_info_att_charset = 101;
 		public const int isc_info_db_class = 102;
 		public const int isc_info_firebird_version = 103;
@@ -754,6 +752,58 @@ internal static class IscCodes
 		public const int isc_info_db_provider = 108;
 		public const int isc_info_active_transactions = 109;
 
+		public const int isc_info_active_tran_count = 110;
+		public const int isc_info_creation_date = 111;
+		public const int isc_info_db_file_size = 112;
+		public const int fb_info_page_contents = 113;
+
+		public const int fb_info_implementation = 114;
+
+		public const int fb_info_page_warns = 115;
+		public const int fb_info_record_warns = 116;
+		public const int fb_info_bpage_warns = 117;
+		public const int fb_info_dpage_warns = 118;
+		public const int fb_info_ipage_warns = 119;
+		public const int fb_info_ppage_warns = 120;
+		public const int fb_info_tpage_warns = 121;
+		public const int fb_info_pip_errors = 122;
+		public const int fb_info_pip_warns = 123;
+
+		public const int fb_info_pages_used = 124;
+		public const int fb_info_pages_free = 125;
+
+		public const int fb_info_ses_idle_timeout_db = 129;
+		public const int fb_info_ses_idle_timeout_att = 130;
+		public const int fb_info_ses_idle_timeout_run = 131;
+
+		public const int fb_info_conn_flags = 132;
+
+		public const int fb_info_crypt_key = 133;
+		public const int fb_info_crypt_state = 134;
+
+		public const int fb_info_statement_timeout_db = 135;
+		public const int fb_info_statement_timeout_att = 136;
+
+		public const int fb_info_protocol_version = 137;
+		public const int fb_info_crypt_plugin = 138;
+
+		public const int fb_info_creation_timestamp_tz = 139;
+
+		public const int fb_info_wire_crypt = 140;
+
+		public const int fb_info_features = 141;
+
+		public const int fb_info_next_attachment = 142;
+		public const int fb_info_next_statement = 143;
+
+		public const int fb_info_db_guid = 144;
+		public const int fb_info_db_file_id = 145;
+
+		public const int fb_info_replica_mode = 146;
+
+		public const int fb_info_username = 147;
+		public const int fb_info_sqlrole = 148;
+
 		#endregion
 
 		#region Information Request

Provider/src/FirebirdSql.Data.FirebirdClient/Common/IscHelper.cs

@@ -40,30 +40,51 @@ public static List<object> ParseDatabaseInfo(byte[] buffer)
 
 				switch (type)
 				{
-					//
-					// Database characteristics
-					//
 					case IscCodes.isc_info_allocation:
-						// Number of database pages allocated
+					case IscCodes.isc_info_ods_version:
+					case IscCodes.isc_info_ods_minor_version:
+					case IscCodes.isc_info_page_size:
+					case IscCodes.isc_info_current_memory:
+					case IscCodes.isc_info_max_memory:
+					case IscCodes.isc_info_num_buffers:
+					case IscCodes.isc_info_sweep_interval:
+					case IscCodes.isc_info_fetches:
+					case IscCodes.isc_info_marks:
+					case IscCodes.isc_info_reads:
+					case IscCodes.isc_info_writes:
+					case IscCodes.isc_info_backout_count:
+					case IscCodes.isc_info_delete_count:
+					case IscCodes.isc_info_expunge_count:
+					case IscCodes.isc_info_insert_count:
+					case IscCodes.isc_info_purge_count:
+					case IscCodes.isc_info_read_idx_count:
+					case IscCodes.isc_info_read_seq_count:
+					case IscCodes.isc_info_update_count:
+					case IscCodes.isc_info_db_size_in_pages:
+					case IscCodes.isc_info_oldest_transaction:
+					case IscCodes.isc_info_oldest_active:
+					case IscCodes.isc_info_oldest_snapshot:
+					case IscCodes.isc_info_next_transaction:
+					case IscCodes.isc_info_active_transactions:
+					case IscCodes.isc_info_active_tran_count:
 						info.Add(VaxInteger(buffer, pos, length));
 						break;
 
+					case IscCodes.isc_info_no_reserve:
+					case IscCodes.isc_info_forced_writes:
+					case IscCodes.isc_info_db_read_only:
+						info.Add(buffer[pos] == 1);
+						break;
+
+					case IscCodes.isc_info_user_names:
+						info.Add(Encoding2.Default.GetString(buffer, pos + 1, buffer[pos]));
+						break;
+
 					case IscCodes.isc_info_base_level:
-						/* Database version (level) number:
-						 * - 1 byte containing the number 1
-						 * - 1 byte containing the version number
-						 */
 						info.Add(string.Format(CultureInfo.CurrentCulture, "{0}.{1}", buffer[pos], buffer[pos + 1]));
 						break;
 
 					case IscCodes.isc_info_db_id:
-						/* Database file name and site name:
-						 * - 1 byte containing the number 2
-						 * - 1 byte containing the length, d, of the database file name in bytes
-						 * - A string of d bytes, containing the database file name
-						 * - 1 byte containing the length, l, of the site name in bytes
-						 * - A string of l bytes, containing the site name
-						 */
 						var dbFile = Encoding2.Default.GetString(buffer, pos + 2, buffer[pos + 1]);
 						var sitePos = pos + 2 + buffer[pos + 1];
 						int siteLength = buffer[sitePos];
@@ -77,58 +98,11 @@ public static List<object> ParseDatabaseInfo(byte[] buffer)
 						break;
 
 					case IscCodes.isc_info_implementation:
-						/* Database implementation number:
-						 * - 1 byte containing a 1
-						 * - 1 byte containing the implementation number
-						 * - 1 byte containing a class number, either 1 or 12
-						 */
 						info.Add(string.Format(CultureInfo.CurrentCulture, "{0}.{1}.{2}", buffer[pos], buffer[pos + 1], buffer[pos + 2]));
 						break;
 
-					case IscCodes.isc_info_no_reserve:
-						/* 0 or 1
-						 * - 0 indicates space is reserved on each database page for holding
-						 *     backup versions of modified records [Default]
-						 * - 1 indicates no space is reserved for such records
-						 */
-						info.Add(buffer[pos] == 1 ? true : false);
-						break;
-
-					case IscCodes.isc_info_ods_version:
-						/* ODS major version number
-						 * - Databases with different major version numbers have different
-						 *   physical layouts; a database engine can only access databases
-						 *   with a particular ODS major version number
-						 * - Trying to attach to a database with a different ODS number
-						 *   results in an error
-						 */
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_ods_minor_version:
-						/* On-disk structure (ODS) minor version number; an increase in a
-						 * minor version number indicates a non-structural change, one that
-						 * still allows the database to be accessed by database engines with
-						 * the same major version number but possibly different minor
-						 * version numbers
-						 */
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_page_size:
-						/* Number of bytes per page of the attached database; use with
-						 * isc_info_allocation to determine the size of the database
-						 */
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
 					case IscCodes.isc_info_isc_version:
 					case IscCodes.isc_info_firebird_version:
-						/* Version identification string of the database implementation:
-						 * - 1 byte containing the number number of message
-						 * - 1 byte specifying the length, of the following string
-						 * - n bytes containing the string
-						 */
 						var messagePosition = pos;
 						var count = buffer[messagePosition];
 						for (var i = 0; i < count; i++)
@@ -139,117 +113,6 @@ public static List<object> ParseDatabaseInfo(byte[] buffer)
 						}
 						break;
 
-					//
-					// Environmental characteristics
-					//
-
-					case IscCodes.isc_info_current_memory:
-						// Amount of server memory (in bytes) currently in use
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_forced_writes:
-						/* Number specifying the mode in which database writes are performed
-						 * (0 for asynchronous, 1 for synchronous)
-						 */
-						info.Add(buffer[pos] == 1 ? true : false);
-						break;
-
-					case IscCodes.isc_info_max_memory:
-						/* Maximum amount of memory (in bytes) used at one time since the first
-						 * process attached to the database
-						 */
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_num_buffers:
-						// Number of memory buffers currently allocated
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_sweep_interval:
-						/* Number of transactions that are committed between sweeps to
-						 * remove database record versions that are no longer needed
-						 */
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					//
-					// Performance statistics
-					//
-
-					case IscCodes.isc_info_fetches:
-						// Number of reads from the memory buffer cache
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_marks:
-						// Number of writes to the memory buffer cache
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_reads:
-						// Number of page reads
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_writes:
-						// Number of page writes
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					//
-					// Database operation counts
-					//
-
-					case IscCodes.isc_info_backout_count:
-						// Number of removals of a version of a record
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_delete_count:
-						// Number of database deletes since the database was last attached
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_expunge_count:
-						/* Number of removals of a record and all of its ancestors, for records
-						 * whose deletions have been committed
-						 */
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_insert_count:
-						// Number of inserts into the database since the database was last attached
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_purge_count:
-						// Number of removals of old versions of fully mature records
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_read_idx_count:
-						// Number of reads done via an index since the database was last attached
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_read_seq_count:
-						/* Number of sequential sequential table scans (row reads) done on each
-						 * table since the database was last attached
-						 */
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_update_count:
-						// Number of database updates since the database was last attached
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					//
-					// Misc
-					//
-
 					case IscCodes.isc_info_db_class:
 						var serverClass = VaxInteger(buffer, pos, length);
 						if (serverClass == IscCodes.isc_info_db_class_classic_access)
@@ -261,45 +124,6 @@ public static List<object> ParseDatabaseInfo(byte[] buffer)
 							info.Add("SUPER SERVER");
 						}
 						break;
-
-					case IscCodes.isc_info_db_read_only:
-						info.Add(buffer[pos] == 1 ? true : false);
-						break;
-
-					case IscCodes.isc_info_db_size_in_pages:
-						// Database size in pages.
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_oldest_transaction:
-						// Number of oldest transaction
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_oldest_active:
-						// Number of oldest active transaction
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_oldest_snapshot:
-						// Number of oldest snapshot transaction
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_next_transaction:
-						// Number of next transaction
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_active_transactions:
-						// Number of active	transactions
-						info.Add(VaxInteger(buffer, pos, length));
-						break;
-
-					case IscCodes.isc_info_user_names:
-						// Active user name
-						info.Add(Encoding2.Default.GetString(buffer, pos + 1, buffer[pos]));
-						break;
 				}
 
 				pos += length;

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbDatabaseInfo.cs

@@ -350,6 +350,15 @@ public Task<List<long>> GetActiveTransactionsAsync(CancellationToken cancellatio
 			return GetListAsync<long>(IscCodes.isc_info_active_transactions, cancellationToken);
 		}
 
+		public int GetActiveTransactionsCount()
+		{
+			return GetValue<int>(IscCodes.isc_info_active_tran_count);
+		}
+		public Task<int> GetActiveTransactionsCountAsync(CancellationToken cancellationToken = default)
+		{
+			return GetValueAsync<int>(IscCodes.isc_info_active_tran_count, cancellationToken);
+		}
+
 		public List<string> GetActiveUsers()
 		{
 			return GetList<string>(IscCodes.isc_info_user_names);