AMBARI-20847 - Remove Refresh Query Hint From Upgrade DAO (jonathanhurley)

ambari-server/src/main/java/org/apache/ambari/server/orm/dao/UpgradeDAO.java

@@ -27,8 +27,6 @@ import org.apache.ambari.server.orm.entities.UpgradeEntity;
 import org.apache.ambari.server.orm.entities.UpgradeGroupEntity;
 import org.apache.ambari.server.orm.entities.UpgradeItemEntity;
 import org.apache.ambari.server.state.stack.upgrade.Direction;
-import org.eclipse.persistence.config.HintValues;
-import org.eclipse.persistence.config.QueryHints;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -90,10 +88,10 @@ public class UpgradeDAO {
 
   @RequiresSession
   public UpgradeEntity findUpgradeByRequestId(Long requestId) {
-    TypedQuery<UpgradeEntity> query = entityManagerProvider.get().createQuery(
-        "SELECT p FROM UpgradeEntity p WHERE p.requestId = :requestId", UpgradeEntity.class);
+    TypedQuery<UpgradeEntity> query = entityManagerProvider.get().createNamedQuery(
+        "UpgradeEntity.findUpgradeByRequestId", UpgradeEntity.class);
+
     query.setParameter("requestId", requestId);
-    query.setHint(QueryHints.REFRESH, HintValues.TRUE);
 
     return daoUtils.selectSingle(query);
   }
@@ -131,26 +129,10 @@ public class UpgradeDAO {
     TypedQuery<UpgradeGroupEntity> query = entityManagerProvider.get().createQuery(
         "SELECT p FROM UpgradeGroupEntity p WHERE p.upgradeGroupId = :groupId", UpgradeGroupEntity.class);
     query.setParameter("groupId", groupId);
-    query.setHint(QueryHints.REFRESH, HintValues.TRUE);
-
-    return daoUtils.selectSingle(query);
-  }
-
-  /**
-   * @param itemId the item id
-   * @return the upgrade item entity, or {@code null} if not found
-   */
-  @RequiresSession
-  public UpgradeItemEntity findUpgradeItem(long itemId) {
-    TypedQuery<UpgradeItemEntity> query = entityManagerProvider.get().createQuery(
-        "SELECT p FROM UpgradeItemEntity p WHERE p.upgradeItemId = :itemId", UpgradeItemEntity.class);
-    query.setParameter("itemId", Long.valueOf(itemId));
-    query.setHint(QueryHints.REFRESH, HintValues.TRUE);
 
     return daoUtils.selectSingle(query);
   }
 
-
   /**
    * @param requestId the request id
    * @param stageId the stage id
@@ -164,8 +146,6 @@ public class UpgradeDAO {
     query.setParameter("requestId", requestId);
     query.setParameter("stageId", stageId);
 
-    query.setHint(QueryHints.REFRESH, HintValues.TRUE);
-
     return daoUtils.selectSingle(query);
   }
 
@@ -184,8 +164,6 @@ public class UpgradeDAO {
     query.setParameter("clusterId", clusterId);
     query.setParameter("direction", direction);
 
-    query.setHint(QueryHints.REFRESH, HintValues.TRUE);
-
     return daoUtils.selectSingle(query);
   }
 
@@ -200,8 +178,6 @@ public class UpgradeDAO {
     query.setMaxResults(1);
     query.setParameter("clusterId", clusterId);
 
-    query.setHint(QueryHints.REFRESH, HintValues.TRUE);
-
     return daoUtils.selectSingle(query);
   }
 

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java

@@ -59,6 +59,8 @@ import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
       query = "SELECT u FROM UpgradeEntity u WHERE u.clusterId = :clusterId"),
   @NamedQuery(name = "UpgradeEntity.findUpgrade",
       query = "SELECT u FROM UpgradeEntity u WHERE u.upgradeId = :upgradeId"),
+  @NamedQuery(name = "UpgradeEntity.findUpgradeByRequestId",
+      query = "SELECT u FROM UpgradeEntity u WHERE u.requestId = :requestId"),  
   @NamedQuery(name = "UpgradeEntity.findLatestForClusterInDirection",
       query = "SELECT u FROM UpgradeEntity u JOIN RequestEntity r ON u.requestId = r.requestId WHERE u.clusterId = :clusterId AND u.direction = :direction ORDER BY r.startTime DESC, u.upgradeId DESC"),
   @NamedQuery(name = "UpgradeEntity.findLatestForCluster",