Fix #8773 and #8774

- #8773 - gstat output of tables does not include schema name
- #8774 - gstat -table will only report one matching table

Author: asfernandes

src/include/firebird/impl/msg/gstat.h

@@ -41,7 +41,7 @@ FB_IMPL_MSG_NO_SYMBOL(GSTAT, 40, "database name was already specified")
 FB_IMPL_MSG_NO_SYMBOL(GSTAT, 41, "option -t needs a table name")
 FB_IMPL_MSG_NO_SYMBOL(GSTAT, 42, "option -t got a too long table name @1")
 FB_IMPL_MSG_NO_SYMBOL(GSTAT, 43, "option -t accepts several table names only if used after <database>")
-FB_IMPL_MSG_NO_SYMBOL(GSTAT, 44, "table \"@1\" not found")
+FB_IMPL_MSG_NO_SYMBOL(GSTAT, 44, "table @1 not found")
 FB_IMPL_MSG_NO_SYMBOL(GSTAT, 45, "use gstat -? to get help")
 FB_IMPL_MSG_NO_SYMBOL(GSTAT, 46, "    Primary pages: @1, secondary pages: @2, swept pages: @3")
 FB_IMPL_MSG_NO_SYMBOL(GSTAT, 47, "    Big record pages: @1")

src/utilities/gstat/dba.epp

@@ -53,6 +53,7 @@
 #include "../jrd/constants.h"
 #include "../jrd/ods_proto.h"
 #include "../common/classes/MsgPrint.h"
+#include "../common/classes/QualifiedMetaString.h"
 #include "../common/classes/UserBlob.h"
 #include "../common/os/os_utils.h"
 #include "../common/StatusHolder.h"
@@ -177,6 +178,7 @@ struct dba_rel
 	USHORT rel_used_formats;
 	SSHORT rel_id;
 	SCHAR rel_name[MAX_SQL_IDENTIFIER_SIZE];
+	SCHAR rel_schema[MAX_SQL_IDENTIFIER_SIZE];
 };
 
 // kidnapped from jrd/pio.h and abused
@@ -813,10 +815,11 @@ int gstat(Firebird::UtilSvc* uSvc)
 	isc_req_handle request4 = 0;
 
 	FOR(TRANSACTION_HANDLE transact1 REQUEST_HANDLE request1)
-		X IN RDB$RELATIONS SORTED BY DESC X.RDB$RELATION_NAME
+		X IN RDB$RELATIONS
+		SORTED BY DESC X.RDB$SCHEMA_NAME, X.RDB$RELATION_NAME
 	{
 		if (!sw_system && X.RDB$SYSTEM_FLAG) {
-		  continue;
+			continue;
 		}
 		if (!X.RDB$VIEW_BLR.NULL || !X.RDB$EXTERNAL_FILE.NULL) {
 			continue;
@@ -828,38 +831,48 @@ int gstat(Firebird::UtilSvc* uSvc)
 			continue;
 		}
 
+		fb_utils::exact_name(X.RDB$SCHEMA_NAME);
+
 		if (sw_schema)
 		{
-			fb_utils::exact_name(X.RDB$SCHEMA_NAME);
-
 			dba_schema* schema = nullptr;
 
 			for (schema = tddba->schemas; schema; schema = schema->next)
 			{
-				if (!(strcmp(schema->name, X.RDB$SCHEMA_NAME)))
+				if (strcmp(schema->name, X.RDB$SCHEMA_NAME) == 0)
 					break;
 			}
 
 			if (!schema)
 				continue;
 		}
 
-		dba_rel* relation;
+		dba_rel* relation = nullptr;
+		bool shouldIncludeRelation = !sw_relation;
+
 		if (sw_relation)
 		{
 			fb_utils::exact_name(X.RDB$RELATION_NAME);
+
 			for (relation = tddba->relations; relation; relation = relation->rel_next)
 			{
-                if (!(strcmp(relation->rel_name, X.RDB$RELATION_NAME)))
-                {
-					relation->rel_id = X.RDB$RELATION_ID;
-					break;
-                }
+				if (strcmp(relation->rel_name, X.RDB$RELATION_NAME) == 0)
+				{
+					shouldIncludeRelation = true;
+
+					if (relation->rel_id == -1)
+					{
+						relation->rel_id = X.RDB$RELATION_ID;
+						break;
+					}
+				}
 			}
-			if (!relation)
+
+			if (!shouldIncludeRelation)
 				continue;
 		}
-		else
+
+		if (!relation)
 		{
 			relation = (dba_rel*) alloc(sizeof(struct dba_rel));
 			relation->rel_next = tddba->relations;
@@ -869,6 +882,8 @@ int gstat(Firebird::UtilSvc* uSvc)
 			fb_utils::exact_name(relation->rel_name);
 		}
 
+		strcpy(relation->rel_schema, X.RDB$SCHEMA_NAME);
+
 		FOR(TRANSACTION_HANDLE transact1 REQUEST_HANDLE request2)
 			Y IN RDB$PAGES WITH Y.RDB$RELATION_ID EQ relation->rel_id AND
 				Y.RDB$PAGE_SEQUENCE EQ 0
@@ -888,8 +903,10 @@ int gstat(Firebird::UtilSvc* uSvc)
 		if (sw_index)
 		{
 			FOR(TRANSACTION_HANDLE transact1 REQUEST_HANDLE request3)
-				Y IN RDB$INDICES WITH Y.RDB$RELATION_NAME EQ relation->rel_name
-					SORTED BY DESC Y.RDB$INDEX_NAME
+				Y IN RDB$INDICES
+				WITH Y.RDB$RELATION_NAME EQ X.RDB$RELATION_NAME AND
+					 Y.RDB$SCHEMA_NAME EQUIV NULLIF(X.RDB$SCHEMA_NAME, '')
+				SORTED BY DESC Y.RDB$INDEX_NAME
 			{
 				if (Y.RDB$INDEX_INACTIVE)
 					  continue;
@@ -975,8 +992,9 @@ int gstat(Firebird::UtilSvc* uSvc)
 			checkForShutdown(tddba);
 			if (relation->rel_id == -1)
 			{
-				dba_error(44, SafeArg() << relation->rel_name);
-				// msg 44: table "@1" not found
+				dba_error(44, SafeArg() <<
+					QualifiedMetaString(relation->rel_name, relation->rel_schema).toQuotedString().c_str());
+				// msg 44: table @1 not found
 			}
 		}
 	}
@@ -1013,7 +1031,9 @@ int gstat(Firebird::UtilSvc* uSvc)
 			continue;
 		}
 
-		uSvc->printf(false, "%s (%d)\n", relation->rel_name, relation->rel_id);
+		uSvc->printf(false, "%s (%d)\n",
+			QualifiedMetaString(relation->rel_name, relation->rel_schema).toQuotedString().c_str(),
+			relation->rel_id);
 
 		if (sw_data)
 		{
@@ -1120,7 +1140,9 @@ int gstat(Firebird::UtilSvc* uSvc)
 
 		for (const dba_idx* index = relation->rel_indexes; index; index = index->idx_next)
 		{
-			dba_print(false, 14, SafeArg() << index->idx_name << index->idx_id);
+			dba_print(false, 14, SafeArg() <<
+				QualifiedMetaString(index->idx_name, relation->rel_schema).toQuotedString().c_str() <<
+				index->idx_id);
 			// msg 14: "    Index %s (%d)"
 
 			uSvc->printf(false, "\tRoot page: %d, depth: %d, leaf buckets: %ld, nodes: %" UQUADFORMAT "\n",