[ambari] branch branch-2.7 updated: AMBARI-24506 - ADDENDUM - Upgrade: Infra Solr service is not renamed in Upgrade History table (#2138)

[krisztiankasa]

This is an automated email from the ASF dual-hosted git repository.

krisztiankasa pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 0cd1b36  AMBARI-24506 - ADDENDUM - Upgrade: Infra Solr service is not 
renamed in Upgrade History table (#2138)
0cd1b36 is described below

commit 0cd1b3693bef25b4d4b4cd336d879545bdc464da
Author: kasakrisz <33458261+kasakr...@users.noreply.github.com>
AuthorDate: Tue Aug 21 17:36:27 2018 +0200

    AMBARI-24506 - ADDENDUM - Upgrade: Infra Solr service is not renamed in 
Upgrade History table (#2138)
---
 .../org/apache/ambari/server/upgrade/UpgradeCatalog271.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
index 8a30951..eb609b1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
@@ -36,7 +36,7 @@ import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.AmbariManagementController;
 import org.apache.ambari.server.orm.DBAccessor;
 import org.apache.ambari.server.orm.dao.DaoUtils;
-import org.apache.ambari.server.orm.entities.ServiceConfigEntity;
+import org.apache.ambari.server.orm.entities.ConfigGroupEntity;
 import org.apache.ambari.server.orm.entities.UpgradeHistoryEntity;
 import org.apache.ambari.server.state.BlueprintProvisioningState;
 import org.apache.ambari.server.state.Cluster;
@@ -288,16 +288,16 @@ public class UpgradeCatalog271 extends 
AbstractUpgradeCatalog {
     EntityManager entityManager = getEntityManagerProvider().get();
 
     executeInTransaction(() -> {
-      TypedQuery<ServiceConfigEntity> serviceConfigUpdate = 
entityManager.createQuery(
-              "UPDATE ConfigGroupEntity SET serviceName = :newServiceName 
WHERE serviceName = :oldServiceName", ServiceConfigEntity.class);
+      TypedQuery<ConfigGroupEntity> serviceConfigUpdate = 
entityManager.createQuery(
+              "UPDATE ConfigGroupEntity SET serviceName = :newServiceName 
WHERE serviceName = :oldServiceName", ConfigGroupEntity.class);
       serviceConfigUpdate.setParameter("newServiceName", 
AMBARI_INFRA_NEW_NAME);
       serviceConfigUpdate.setParameter("oldServiceName", 
AMBARI_INFRA_OLD_NAME);
       serviceConfigUpdate.executeUpdate();
     });
 
     executeInTransaction(() -> {
-      TypedQuery<ServiceConfigEntity> serviceConfigUpdate = 
entityManager.createQuery(
-              "UPDATE ConfigGroupEntity SET tag = :newServiceName WHERE tag = 
:oldServiceName", ServiceConfigEntity.class);
+      TypedQuery<ConfigGroupEntity> serviceConfigUpdate = 
entityManager.createQuery(
+              "UPDATE ConfigGroupEntity SET tag = :newServiceName WHERE tag = 
:oldServiceName", ConfigGroupEntity.class);
       serviceConfigUpdate.setParameter("newServiceName", 
AMBARI_INFRA_NEW_NAME);
       serviceConfigUpdate.setParameter("oldServiceName", 
AMBARI_INFRA_OLD_NAME);
       serviceConfigUpdate.executeUpdate();
@@ -305,7 +305,7 @@ public class UpgradeCatalog271 extends 
AbstractUpgradeCatalog {
 
     executeInTransaction(() -> {
       TypedQuery<UpgradeHistoryEntity> upgradeHistoryUpdate = 
entityManager.createQuery(
-        "UPDATE UpgradeHistoryEntity SET service_name = :newServiceName WHERE 
service_name = :oldServiceName", UpgradeHistoryEntity.class);
+        "UPDATE UpgradeHistoryEntity SET serviceName = :newServiceName WHERE 
serviceName = :oldServiceName", UpgradeHistoryEntity.class);
       upgradeHistoryUpdate.setParameter("newServiceName", 
AMBARI_INFRA_NEW_NAME);
       upgradeHistoryUpdate.setParameter("oldServiceName", 
AMBARI_INFRA_OLD_NAME);
       upgradeHistoryUpdate.executeUpdate();