Repository: ambari Updated Branches: refs/heads/branch-2.6 47bf925e5 -> d569a746c
Revert "AMBARI-22267 - Version registration failure during patch upgrade + Debian + Oracle run (jonathanhurley)" This reverts commit e898087fbc4c4515d0f393f9de3e735902876823. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d569a746 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d569a746 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d569a746 Branch: refs/heads/branch-2.6 Commit: d569a746ca17d139a07cb0203768a1da8349274e Parents: 47bf925 Author: Jonathan Hurley <[email protected]> Authored: Wed Oct 18 19:06:16 2017 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Wed Oct 18 19:06:16 2017 -0400 ---------------------------------------------------------------------- .../ambari/server/orm/entities/RepositoryVersionEntity.java | 5 ++++- .../ambari/server/orm/entities/ServiceDesiredStateEntity.java | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d569a746/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java index 5936783..edfe494 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java @@ -21,11 +21,13 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import javax.persistence.Basic; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; +import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -92,7 +94,7 @@ import com.google.inject.Provider; query = "SELECT repositoryVersion FROM RepositoryVersionEntity repositoryVersion WHERE repositoryVersion.version = :version ORDER BY repositoryVersion.id DESC"), @NamedQuery( name = "findByServiceDesiredVersion", - query = "SELECT sd.desiredRepositoryVersion from ServiceDesiredStateEntity sd WHERE sd.desiredRepositoryVersion IN ?1 GROUP BY sd.desiredRepositoryVersion.id") }) + query = "SELECT DISTINCT sd.desiredRepositoryVersion from ServiceDesiredStateEntity sd WHERE sd.desiredRepositoryVersion IN ?1") }) @StaticallyInject public class RepositoryVersionEntity { private static Logger LOG = LoggerFactory.getLogger(RepositoryVersionEntity.class); @@ -129,6 +131,7 @@ public class RepositoryVersionEntity { @Enumerated(value = EnumType.STRING) private RepositoryType type = RepositoryType.STANDARD; + @Basic(fetch=FetchType.LAZY) @Lob @Column(name="version_xml", insertable = true, updatable = true) private String versionXml; http://git-wip-us.apache.org/repos/asf/ambari/blob/d569a746/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java index 3ef0768..0124d3e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java @@ -40,20 +40,20 @@ import org.apache.commons.lang.builder.EqualsBuilder; @Entity public class ServiceDesiredStateEntity { + @Column(name = "cluster_id", nullable = false, insertable = false, updatable = false, length = 10) @Id - @Column(name = "cluster_id", nullable = false, insertable = false, updatable = false, length = 10) private Long clusterId; - @Id @Column(name = "service_name", nullable = false, insertable = false, updatable = false) + @Id private String serviceName; @Column(name = "desired_state", nullable = false, insertable = true, updatable = true) @Enumerated(value = EnumType.STRING) private State desiredState = State.INIT; + @Column(name = "desired_host_role_mapping", nullable = false, insertable = true, updatable = true, length = 10) @Basic - @Column(name = "desired_host_role_mapping", nullable = false, insertable = true, updatable = true, length = 10) private int desiredHostRoleMapping = 0; @Column(name = "maintenance_state", nullable = false, insertable = true, updatable = true)
