Fix #8663: Problem with restore time when DB has many indices

Author: dyemanov

src/jrd/ini.epp

@@ -732,6 +732,8 @@ void INI_format(thread_db* tdbb, const string& charset)
 	}
 	END_STORE
 
+	HalfStaticArray<QualifiedName, 2> predefinedSchemas;
+
 	// Store SYSTEM schema
 
 	handle.reset();
@@ -749,13 +751,14 @@ void INI_format(thread_db* tdbb, const string& charset)
 	}
 	END_STORE
 
-	storeGrant(tdbb, attachment->getUserName().c_str(), obj_user, QualifiedName(SYSTEM_SCHEMA),
-		obj_schema, USAGE_PRIVILEGES, false);
+	const QualifiedName systemSchema(SYSTEM_SCHEMA);
+	predefinedSchemas.add(systemSchema);
 
-	storeGrant(tdbb, "PUBLIC", obj_user, QualifiedName(SYSTEM_SCHEMA),
+	storeGrant(tdbb, ownerName.c_str(), obj_user, systemSchema,
 		obj_schema, USAGE_PRIVILEGES, false);
 
-	GRANT_privileges(tdbb, QualifiedName(SYSTEM_SCHEMA), obj_schema, transaction);
+	storeGrant(tdbb, "PUBLIC", obj_user, systemSchema,
+		obj_schema, USAGE_PRIVILEGES, false);
 
 	if (!attachment->isGbak() || !(attachment->att_flags & ATT_gbak_restore_has_schema))
 	{
@@ -774,19 +777,26 @@ void INI_format(thread_db* tdbb, const string& charset)
 		}
 		END_STORE
 
-		storeGrant(tdbb, attachment->getUserName().c_str(), obj_user, QualifiedName(PUBLIC_SCHEMA),
-			obj_schema, USAGE_PRIVILEGES, true);
+		const QualifiedName publicSchema(PUBLIC_SCHEMA);
+		predefinedSchemas.add(publicSchema);
 
-		storeGrant(tdbb, "PUBLIC", obj_user, QualifiedName(PUBLIC_SCHEMA),
+		storeGrant(tdbb, ownerName.c_str(), obj_user, publicSchema,
 			obj_schema, USAGE_PRIVILEGES, true);
 
-		GRANT_privileges(tdbb, QualifiedName(PUBLIC_SCHEMA), obj_schema, transaction);
+		storeGrant(tdbb, "PUBLIC", obj_user, publicSchema,
+			obj_schema, USAGE_PRIVILEGES, true);
 	}
 
 	// Create indices for system relations
 
 	store_indices(tdbb);
 
+	// Grant schema privileges. This is defered until system indices are created
+	// to avoid some system queries being badly optimized.
+
+	for (const auto& schema : predefinedSchemas)
+		GRANT_privileges(tdbb, schema, obj_schema, transaction);
+
 	// Create parameter types
 
 	handle.reset();