Просмотр исходного кода

Minor cleanup: added printout for version update, null UUID check, variable rename

Signed-off-by: amzn-mike <[email protected]>
amzn-mike 3 лет назад
Родитель
Сommit
b29767dc23

+ 3 - 3
Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp

@@ -731,7 +731,7 @@ namespace AzToolsFramework
                 "SourceGuid = :source AND "
                 "TypeOfDependency & :typeOfDependency AND "
                 "DependsOnSource LIKE :dependencyFilter;";
-            static const auto s_queryDependsonsourceBySource = MakeSqlQuery(QUERY_DEPENDSONSOURCE_BY_SOURCE, QUERY_DEPENDSONSOURCE_BY_SOURCE_STATEMENT, LOG_NAME,
+            static const auto s_queryDependsOnSourceBySource = MakeSqlQuery(QUERY_DEPENDSONSOURCE_BY_SOURCE, QUERY_DEPENDSONSOURCE_BY_SOURCE_STATEMENT, LOG_NAME,
                 SqlParam<AZ::Uuid>(":source"),
                 SqlParam<const char*>(":dependencyFilter"),
                 SqlParam<AZ::u32>(":typeOfDependency"));
@@ -1889,7 +1889,7 @@ namespace AzToolsFramework
             AddStatement(m_databaseConnection, s_querySourcedependencyBySourcedependencyid);
             AddStatement(m_databaseConnection, s_querySourcedependencyByDependsonsource);
             AddStatement(m_databaseConnection, s_querySourcedependencyByDependsonsourceWildcard);
-            AddStatement(m_databaseConnection, s_queryDependsonsourceBySource);
+            AddStatement(m_databaseConnection, s_queryDependsOnSourceBySource);
 
             AddStatement(m_databaseConnection, s_queryProductdependencyByProductdependencyid);
             AddStatement(m_databaseConnection, s_queryProductdependencyByProductid);
@@ -2561,7 +2561,7 @@ namespace AzToolsFramework
 
         bool AssetDatabaseConnection::QueryDependsOnSourceBySourceDependency(AZ::Uuid sourceGuid, const char* dependencyFilter, AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::TypeOfDependency dependencyType, sourceFileDependencyHandler handler)
         {
-            return s_queryDependsonsourceBySource.BindAndQuery(*m_databaseConnection, handler, &GetSourceDependencyResult, sourceGuid, dependencyFilter == nullptr ? "%" : dependencyFilter, dependencyType);
+            return s_queryDependsOnSourceBySource.BindAndQuery(*m_databaseConnection, handler, &GetSourceDependencyResult, sourceGuid, dependencyFilter == nullptr ? "%" : dependencyFilter, dependencyType);
         }
 
         bool AzToolsFramework::AssetDatabase::AssetDatabaseConnection::QueryProductDependenciesThatDependOnProductBySourceId(AZ::s64 sourceId, productDependencyHandler handler)

+ 5 - 0
Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserComponent.cpp

@@ -216,6 +216,11 @@ namespace AzToolsFramework
             return false;
         });
 
+        if (sourceUuid.IsNull())
+        {
+            return false;
+        }
+
         bool succeeded = m_databaseConnection->QueryDependsOnSourceBySourceDependency(
             sourceUuid, "%.slice",
             AzToolsFramework::AssetDatabase::SourceFileDependencyEntry::DEP_SourceOrJob,

+ 1 - 0
Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp

@@ -1130,6 +1130,7 @@ namespace AssetProcessor
             // Do nothing so the whole database is dropped.
             // Unfortunately we have to reprocess all assets because of the way the fingerprinting algorithm works,
             // changing from storing the path to the UUID changes the fingerprint, resulting in all assets reprocessing anyway
+            AZ_TracePrintf(AssetProcessor::ConsoleChannel, "Asset database version updated to ChangedSourceDependencySourceColumn, database will be cleared as migration is not possible for this update\n", foundVersion);
         }
 
         if (foundVersion == CurrentDatabaseVersion())