From 558d4f781df61964e0a1503be3bcf6ddcd2188ac Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Wed, 18 Mar 2015 18:45:54 +0100
Subject: [PATCH] Fix regression in SourcePersister

---
 .../main/java/org/sonar/batch/index/SourcePersister.java  | 8 +++++---
 .../org/sonar/core/source/db/FileSourceMapper.xml         | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/SourcePersister.java b/sonar-batch/src/main/java/org/sonar/batch/index/SourcePersister.java
index e27d9eca168..5a86495495d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/index/SourcePersister.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/SourcePersister.java
@@ -107,14 +107,16 @@ public class SourcePersister implements ScanPersister {
       session.commit();
     } else {
       // Update only if data_hash has changed or if src_hash is missing (progressive migration)
-      if (!dataHash.equals(previousDto.getDataHash()) || !metadata.hash().equals(previousDto.getSrcHash())) {
+      boolean binaryDataUpdated = !dataHash.equals(previousDto.getDataHash());
+      boolean srcHashUpdated = !metadata.hash().equals(previousDto.getSrcHash());
+      if (binaryDataUpdated || srcHashUpdated) {
         previousDto
           .setBinaryData(data)
           .setDataHash(dataHash)
           .setSrcHash(metadata.hash())
           .setLineHashes(lineHashesAsMd5Hex(inputFile));
-        // Optimization do not change updated at when updating src_hash to avoid indexation by E/S
-        if (!dataHash.equals(previousDto.getDataHash())) {
+        // Optimization only change updated at when updating binary data to avoid unecessary indexation by E/S
+        if (binaryDataUpdated) {
           previousDto.setUpdatedAt(0L);
         }
         mapper.update(previousDto);
diff --git a/sonar-core/src/main/resources/org/sonar/core/source/db/FileSourceMapper.xml b/sonar-core/src/main/resources/org/sonar/core/source/db/FileSourceMapper.xml
index 49ede1dfb30..061c84eb19d 100644
--- a/sonar-core/src/main/resources/org/sonar/core/source/db/FileSourceMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/source/db/FileSourceMapper.xml
@@ -12,7 +12,7 @@
   </select>
   
   <select id="selectHashesForProject" parameterType="string" resultType="org.sonar.core.source.db.FileSourceDto">
-    SELECT id, file_uuid as fileUuid, data_hash as dataHash, src_hash as srcHash
+    SELECT id, file_uuid as fileUuid, data_hash as dataHash, src_hash as srcHash, updated_at as updatedAt
     FROM file_sources
     WHERE project_uuid = #{projectUuid}
   </select>
-- 
2.39.5