Merge branch 'upstream/development' into LYN-8514_AutomatedReviewServerLogChecks
This commit is contained in:
@@ -2610,15 +2610,8 @@ namespace AssetProcessor
|
||||
{
|
||||
ScopedTransaction transaction(m_databaseConnection);
|
||||
|
||||
const char* statementName = INSERT_NEW_LEGACYSUBID;
|
||||
|
||||
bool creatingNew = entry.m_subIDsEntryID == InvalidEntryId;
|
||||
|
||||
if (!creatingNew)
|
||||
{
|
||||
statementName = OVERWRITE_EXISTING_LEGACYSUBID;
|
||||
}
|
||||
|
||||
if (creatingNew)
|
||||
{
|
||||
if (!s_InsertNewLegacysubidQuery.BindAndStep(*m_databaseConnection, entry.m_productPK, entry.m_subID))
|
||||
|
||||
@@ -274,11 +274,9 @@ namespace AssetProcessor
|
||||
}
|
||||
|
||||
//look for the job in flight first
|
||||
bool found = false;
|
||||
auto foundElement = m_jobRunKeyToJobInfoMap.find(request.m_jobRunKey);
|
||||
if (foundElement != m_jobRunKeyToJobInfoMap.end())
|
||||
{
|
||||
found = true;
|
||||
jobInfo = foundElement->second;
|
||||
}
|
||||
else
|
||||
@@ -296,7 +294,6 @@ namespace AssetProcessor
|
||||
|
||||
AZ_Assert(jobInfos.size() == 1, "Should only have found one jobInfo!!!");
|
||||
jobInfo = AZStd::move(jobInfos[0]);
|
||||
found = true;
|
||||
}
|
||||
|
||||
if (jobInfo.m_status == JobStatus::Failed_InvalidSourceNameExceedsMaxLimit)
|
||||
|
||||
@@ -177,11 +177,9 @@ namespace AssetProcessor
|
||||
AZ_TracePrintf(AssetProcessor::DebugChannel, "JobTrace AddNewJob(%i %s,%s,%s)\n", rcJob, rcJob->GetInputFileAbsolutePath().toUtf8().constData(), rcJob->GetPlatformInfo().m_identifier.c_str(), rcJob->GetJobKey().toUtf8().constData());
|
||||
#endif
|
||||
|
||||
bool isPending = false;
|
||||
if (rcJob->GetState() == RCJob::pending)
|
||||
{
|
||||
m_jobsInQueueLookup.insert(rcJob->GetElementID(), rcJob);
|
||||
isPending = true;
|
||||
}
|
||||
endInsertRows();
|
||||
}
|
||||
|
||||
@@ -152,7 +152,6 @@ void RCcontrollerUnitTests::RunRCControllerTests()
|
||||
}
|
||||
|
||||
QModelIndex rcJobIndex;
|
||||
int rcJobJobIndex;
|
||||
QString rcJobCommand;
|
||||
QString rcJobState;
|
||||
|
||||
@@ -172,7 +171,6 @@ void RCcontrollerUnitTests::RunRCControllerTests()
|
||||
return;
|
||||
}
|
||||
|
||||
rcJobJobIndex = rcJobListModel->data(rcJobIndex, RCJobListModel::jobIndexRole).toInt();
|
||||
rcJobCommand = rcJobListModel->data(rcJobIndex, RCJobListModel::displayNameRole).toString();
|
||||
rcJobState = rcJobListModel->data(rcJobIndex, RCJobListModel::stateRole).toString();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user