You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/04/24 07:56:40 UTC
ambari git commit: AMBARI-10637: [WinTP2] SQLServer transaction
deadlock causes deployment on Windows to be busted (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk bc85c29e6 -> 14cbdabe7
AMBARI-10637: [WinTP2] SQLServer transaction deadlock causes deployment on Windows to be busted (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/14cbdabe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14cbdabe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14cbdabe
Branch: refs/heads/trunk
Commit: 14cbdabe7232bd2d020824a1bbed1f6f905a458b
Parents: bc85c29
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Thu Apr 23 22:56:32 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Thu Apr 23 22:56:32 2015 -0700
----------------------------------------------------------------------
.../apache/ambari/server/orm/entities/AlertCurrentEntity.java | 2 +-
.../apache/ambari/server/orm/entities/AlertDefinitionEntity.java | 2 +-
.../org/apache/ambari/server/orm/entities/AlertGroupEntity.java | 2 +-
.../apache/ambari/server/orm/entities/AlertHistoryEntity.java | 2 +-
.../org/apache/ambari/server/orm/entities/AlertNoticeEntity.java | 2 +-
.../org/apache/ambari/server/orm/entities/AlertTargetEntity.java | 2 +-
.../apache/ambari/server/orm/entities/ClusterConfigEntity.java | 1 -
.../org/apache/ambari/server/orm/entities/ClusterEntity.java | 1 -
.../apache/ambari/server/orm/entities/ClusterVersionEntity.java | 1 -
.../org/apache/ambari/server/orm/entities/ConfigGroupEntity.java | 1 -
.../java/org/apache/ambari/server/orm/entities/GroupEntity.java | 3 +--
.../java/org/apache/ambari/server/orm/entities/HostEntity.java | 1 -
.../apache/ambari/server/orm/entities/HostRoleCommandEntity.java | 1 -
.../org/apache/ambari/server/orm/entities/HostVersionEntity.java | 1 -
.../org/apache/ambari/server/orm/entities/PermissionEntity.java | 1 -
.../apache/ambari/server/orm/entities/PrincipalTypeEntity.java | 1 -
.../org/apache/ambari/server/orm/entities/PrivilegeEntity.java | 1 -
.../ambari/server/orm/entities/RepositoryVersionEntity.java | 3 +--
.../ambari/server/orm/entities/RequestOperationLevelEntity.java | 1 -
.../ambari/server/orm/entities/RequestResourceFilterEntity.java | 1 -
.../apache/ambari/server/orm/entities/RequestScheduleEntity.java | 1 -
.../org/apache/ambari/server/orm/entities/ResourceEntity.java | 1 -
.../apache/ambari/server/orm/entities/ResourceTypeEntity.java | 1 -
.../apache/ambari/server/orm/entities/ServiceConfigEntity.java | 1 -
.../java/org/apache/ambari/server/orm/entities/StackEntity.java | 2 +-
.../org/apache/ambari/server/orm/entities/UpgradeEntity.java | 2 +-
.../apache/ambari/server/orm/entities/UpgradeGroupEntity.java | 2 +-
.../org/apache/ambari/server/orm/entities/UpgradeItemEntity.java | 2 +-
.../org/apache/ambari/server/orm/entities/ViewEntityEntity.java | 4 ++--
.../apache/ambari/server/orm/entities/ViewInstanceEntity.java | 1 -
.../java/org/apache/ambari/server/orm/entities/WidgetEntity.java | 3 +--
.../apache/ambari/server/orm/entities/WidgetLayoutEntity.java | 3 +--
32 files changed, 16 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertCurrentEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertCurrentEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertCurrentEntity.java
index 66aa119..26e0d00 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertCurrentEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertCurrentEntity.java
@@ -44,7 +44,7 @@ import org.apache.ambari.server.state.MaintenanceState;
*/
@Entity
@Table(name = "alert_current")
-@TableGenerator(name = "alert_current_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_current_id_seq", initialValue = 0, allocationSize = 1)
+@TableGenerator(name = "alert_current_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_current_id_seq", initialValue = 0)
@NamedQueries({
@NamedQuery(name = "AlertCurrentEntity.findAll", query = "SELECT alert FROM AlertCurrentEntity alert"),
@NamedQuery(name = "AlertCurrentEntity.findByCluster", query = "SELECT alert FROM AlertCurrentEntity alert WHERE alert.alertHistory.clusterId = :clusterId"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java
index 6838983..c20fd25 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java
@@ -55,7 +55,7 @@ import org.apache.ambari.server.state.alert.SourceType;
@Entity
@Table(name = "alert_definition", uniqueConstraints = @UniqueConstraint(columnNames = {
"cluster_id", "definition_name" }))
-@TableGenerator(name = "alert_definition_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_definition_id_seq", initialValue = 0, allocationSize = 1)
+@TableGenerator(name = "alert_definition_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_definition_id_seq", initialValue = 0)
@NamedQueries({
@NamedQuery(name = "AlertDefinitionEntity.findAll", query = "SELECT ad FROM AlertDefinitionEntity ad"),
@NamedQuery(name = "AlertDefinitionEntity.findAllInCluster", query = "SELECT ad FROM AlertDefinitionEntity ad WHERE ad.clusterId = :clusterId"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertGroupEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertGroupEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertGroupEntity.java
index 9efb166..0d6d151 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertGroupEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertGroupEntity.java
@@ -44,7 +44,7 @@ import javax.persistence.UniqueConstraint;
@Entity
@Table(name = "alert_group", uniqueConstraints = @UniqueConstraint(columnNames = {
"cluster_id", "group_name" }))
-@TableGenerator(name = "alert_group_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_group_id_seq", initialValue = 0, allocationSize = 1)
+@TableGenerator(name = "alert_group_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_group_id_seq", initialValue = 0)
@NamedQueries({
@NamedQuery(name = "AlertGroupEntity.findAll", query = "SELECT alertGroup FROM AlertGroupEntity alertGroup"),
@NamedQuery(name = "AlertGroupEntity.findAllInCluster", query = "SELECT alertGroup FROM AlertGroupEntity alertGroup WHERE alertGroup.clusterId = :clusterId"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
index 8e96aca..8423abe 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertHistoryEntity.java
@@ -42,7 +42,7 @@ import org.apache.ambari.server.state.AlertState;
*/
@Entity
@Table(name = "alert_history")
-@TableGenerator(name = "alert_history_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_history_id_seq", initialValue = 0, allocationSize = 1)
+@TableGenerator(name = "alert_history_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_history_id_seq", initialValue = 0)
@NamedQueries({
@NamedQuery(name = "AlertHistoryEntity.findAll", query = "SELECT alertHistory FROM AlertHistoryEntity alertHistory"),
@NamedQuery(name = "AlertHistoryEntity.findAllInCluster", query = "SELECT alertHistory FROM AlertHistoryEntity alertHistory WHERE alertHistory.clusterId = :clusterId"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertNoticeEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertNoticeEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertNoticeEntity.java
index ae43dfe..c2f61b3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertNoticeEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertNoticeEntity.java
@@ -44,7 +44,7 @@ import org.apache.ambari.server.state.NotificationState;
*/
@Entity
@Table(name = "alert_notice")
-@TableGenerator(name = "alert_notice_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_notice_id_seq", initialValue = 0, allocationSize = 1)
+@TableGenerator(name = "alert_notice_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_notice_id_seq", initialValue = 0)
@NamedQueries({
@NamedQuery(name = "AlertNoticeEntity.findAll", query = "SELECT notice FROM AlertNoticeEntity notice"),
@NamedQuery(name = "AlertNoticeEntity.findByState", query = "SELECT notice FROM AlertNoticeEntity notice WHERE notice.notifyState = :notifyState"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
index 29f79d7..ce29921 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java
@@ -56,7 +56,7 @@ import com.google.common.collect.ImmutableSet;
*/
@Entity
@Table(name = "alert_target")
-@TableGenerator(name = "alert_target_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_target_id_seq", initialValue = 0, allocationSize = 1)
+@TableGenerator(name = "alert_target_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "alert_target_id_seq", initialValue = 0)
@NamedQueries({
@NamedQuery(name = "AlertTargetEntity.findAll", query = "SELECT alertTarget FROM AlertTargetEntity alertTarget"),
@NamedQuery(name = "AlertTargetEntity.findAllGlobal", query = "SELECT alertTarget FROM AlertTargetEntity alertTarget WHERE alertTarget.isGlobal = 1"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
index 8a79d1f..8d304c0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterConfigEntity.java
@@ -47,7 +47,6 @@ import javax.persistence.UniqueConstraint;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "config_id_seq"
, initialValue = 1
- , allocationSize = 1
)
@NamedQueries({ @NamedQuery(name = "ClusterConfigEntity.findNextConfigVersion", query = "SELECT COALESCE(MAX(clusterConfig.version),0) + 1 as nextVersion FROM ClusterConfigEntity clusterConfig WHERE clusterConfig.type=:configType AND clusterConfig.clusterId=:clusterId") })
public class ClusterConfigEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
index e4a35a7..3fe541f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterEntity.java
@@ -65,7 +65,6 @@ import org.apache.ambari.server.state.State;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "cluster_id_seq"
, initialValue = 1
- , allocationSize = 1
)
public class ClusterEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterVersionEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterVersionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterVersionEntity.java
index 5181a0d..f1867b4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterVersionEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ClusterVersionEntity.java
@@ -43,7 +43,6 @@ import org.apache.ambari.server.state.RepositoryVersionState;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "cluster_version_id_seq"
, initialValue = 0
- , allocationSize = 1
)
@NamedQueries({
@NamedQuery(name = "clusterVersionByClusterAndStackAndVersion", query =
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ConfigGroupEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ConfigGroupEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ConfigGroupEntity.java
index f791ffd..5ef2f80 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ConfigGroupEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ConfigGroupEntity.java
@@ -50,7 +50,6 @@ import java.util.Collection;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "configgroup_id_seq"
, initialValue = 1
- , allocationSize = 1
)
public class ConfigGroupEntity {
@Id
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/GroupEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/GroupEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/GroupEntity.java
index 9c3411e..00e233e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/GroupEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/GroupEntity.java
@@ -42,8 +42,7 @@ import javax.persistence.UniqueConstraint;
pkColumnName = "sequence_name",
valueColumnName = "sequence_value",
pkColumnValue = "group_id_seq",
- initialValue = 1,
- allocationSize = 1
+ initialValue = 1
)
@NamedQueries({
@NamedQuery(name = "groupByName", query = "SELECT group_entity FROM GroupEntity group_entity where lower(group_entity.groupName)=:groupname")
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostEntity.java
index 1ed1020..9f3f70c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostEntity.java
@@ -47,7 +47,6 @@ import javax.persistence.TableGenerator;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "host_id_seq"
, initialValue = 0
- , allocationSize = 1
)
@NamedQueries({
@NamedQuery(name = "HostEntity.findByHostName", query = "SELECT host FROM HostEntity host WHERE host.hostName = :hostName"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostRoleCommandEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostRoleCommandEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostRoleCommandEntity.java
index a2bbd1c..3919555 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostRoleCommandEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostRoleCommandEntity.java
@@ -53,7 +53,6 @@ import org.apache.commons.lang.ArrayUtils;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "host_role_command_id_seq"
, initialValue = 1
- , allocationSize = 50
)
@NamedQueries({
@NamedQuery(name = "HostRoleCommandEntity.findCountByCommandStatuses", query = "SELECT COUNT(command.taskId) FROM HostRoleCommandEntity command WHERE command.status IN :statuses"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
index 9d7d68f..14034a4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
@@ -40,7 +40,6 @@ import org.apache.ambari.server.state.RepositoryVersionState;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "host_version_id_seq"
, initialValue = 0
- , allocationSize = 1
)
@NamedQueries({
@NamedQuery(name = "hostVersionByClusterAndStackAndVersion", query =
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PermissionEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PermissionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PermissionEntity.java
index 6d1d873..db73774 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PermissionEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PermissionEntity.java
@@ -39,7 +39,6 @@ import javax.persistence.TableGenerator;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "permission_id_seq"
, initialValue = 5
- , allocationSize = 1
)
public class PermissionEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PrincipalTypeEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PrincipalTypeEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PrincipalTypeEntity.java
index f7c0aa1..f05a643 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PrincipalTypeEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PrincipalTypeEntity.java
@@ -29,7 +29,6 @@ import javax.persistence.*;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "principal_type_id_seq"
, initialValue = 3
- , allocationSize = 1
)
public class PrincipalTypeEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PrivilegeEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PrivilegeEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PrivilegeEntity.java
index d86a22c..1832acc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PrivilegeEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/PrivilegeEntity.java
@@ -39,7 +39,6 @@ import javax.persistence.TableGenerator;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "privilege_id_seq"
, initialValue = 1
- , allocationSize = 1
)
public class PrivilegeEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/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 bcd7071..9f597a2 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
@@ -57,8 +57,7 @@ import com.google.inject.Provider;
pkColumnName = "sequence_name",
valueColumnName = "sequence_value",
pkColumnValue = "repo_version_id_seq",
- initialValue = 0,
- allocationSize = 1
+ initialValue = 0
)
@NamedQueries({
@NamedQuery(name = "repositoryVersionByDisplayName", query = "SELECT repoversion FROM RepositoryVersionEntity repoversion WHERE repoversion.displayName=:displayname"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestOperationLevelEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestOperationLevelEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestOperationLevelEntity.java
index 9f8453c..4c38a97 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestOperationLevelEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestOperationLevelEntity.java
@@ -39,7 +39,6 @@ import javax.persistence.TableGenerator;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "operation_level_id_seq"
, initialValue = 1
- , allocationSize = 1
)
public class RequestOperationLevelEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestResourceFilterEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestResourceFilterEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestResourceFilterEntity.java
index 0dc7807..8ee41d2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestResourceFilterEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestResourceFilterEntity.java
@@ -35,7 +35,6 @@ import javax.persistence.TableGenerator;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "resourcefilter_id_seq"
, initialValue = 1
- , allocationSize = 1
)
public class RequestResourceFilterEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestScheduleEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestScheduleEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestScheduleEntity.java
index 5ed3480..fa7094e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestScheduleEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RequestScheduleEntity.java
@@ -46,7 +46,6 @@ import java.util.List;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "requestschedule_id_seq"
, initialValue = 1
- , allocationSize = 1
)
public class RequestScheduleEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ResourceEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ResourceEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ResourceEntity.java
index 0b7e591..04dbd76 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ResourceEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ResourceEntity.java
@@ -29,7 +29,6 @@ import javax.persistence.*;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "resource_id_seq"
, initialValue = 2
- , allocationSize = 1
)
public class ResourceEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ResourceTypeEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ResourceTypeEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ResourceTypeEntity.java
index 6cebf08..3c434ea 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ResourceTypeEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ResourceTypeEntity.java
@@ -29,7 +29,6 @@ import javax.persistence.*;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "resource_type_id_seq"
, initialValue = 4
- , allocationSize = 1
)
public class ResourceTypeEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
index cd3bb54..c8a74a6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
@@ -44,7 +44,6 @@ import javax.persistence.TableGenerator;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "service_config_id_seq"
, initialValue = 1
- , allocationSize = 1
)
@NamedQueries({ @NamedQuery(name = "ServiceConfigEntity.findNextServiceConfigVersion", query = "SELECT COALESCE(MAX(serviceConfig.version), 0) + 1 AS nextVersion FROM ServiceConfigEntity serviceConfig WHERE serviceConfig.serviceName=:serviceName AND serviceConfig.clusterId=:clusterId") })
public class ServiceConfigEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/StackEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/StackEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/StackEntity.java
index 2d75917..c425969 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/StackEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/StackEntity.java
@@ -36,7 +36,7 @@ import javax.persistence.UniqueConstraint;
@Entity
@Table(name = "stack", uniqueConstraints = @UniqueConstraint(columnNames = {
"stack_name", "stack_version" }))
-@TableGenerator(name = "stack_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "stack_id_seq", initialValue = 0, allocationSize = 1)
+@TableGenerator(name = "stack_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value", pkColumnValue = "stack_id_seq", initialValue = 0)
@NamedQueries({
@NamedQuery(name = "StackEntity.findAll", query = "SELECT stack FROM StackEntity stack"),
@NamedQuery(name = "StackEntity.findByNameAndVersion", query = "SELECT stack FROM StackEntity stack WHERE stack.stackName = :stackName AND stack.stackVersion = :stackVersion") })
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
index a2eeea3..e8723e0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
@@ -42,7 +42,7 @@ import org.apache.ambari.server.state.stack.upgrade.Direction;
@Entity
@TableGenerator(name = "upgrade_id_generator",
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value",
- pkColumnValue = "upgrade_id_seq", initialValue = 0, allocationSize = 1)
+ pkColumnValue = "upgrade_id_seq", initialValue = 0)
@NamedQueries({
@NamedQuery(name = "UpgradeEntity.findAllForCluster",
query = "SELECT u FROM UpgradeEntity u WHERE u.clusterId = :clusterId"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeGroupEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeGroupEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeGroupEntity.java
index 534a461..7b57184 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeGroupEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeGroupEntity.java
@@ -39,7 +39,7 @@ import javax.persistence.TableGenerator;
@Entity
@TableGenerator(name = "upgrade_group_id_generator",
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value",
- pkColumnValue = "upgrade_group_id_seq", initialValue = 0, allocationSize = 1)
+ pkColumnValue = "upgrade_group_id_seq", initialValue = 0)
public class UpgradeGroupEntity {
@Id
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeItemEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeItemEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeItemEntity.java
index fe9508b..6e4a889 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeItemEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeItemEntity.java
@@ -39,7 +39,7 @@ import org.apache.ambari.server.state.UpgradeState;
@Entity
@TableGenerator(name = "upgrade_item_id_generator",
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value",
- pkColumnValue = "upgrade_item_id_seq", initialValue = 0, allocationSize = 1)
+ pkColumnValue = "upgrade_item_id_seq", initialValue = 0)
public class UpgradeItemEntity {
@Id
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewEntityEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewEntityEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewEntityEntity.java
index 30d6e23..1b8b932 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewEntityEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewEntityEntity.java
@@ -39,8 +39,8 @@ import javax.persistence.TableGenerator;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "viewentity_id_seq"
, initialValue = 1
- , allocationSize = 50
-)public class ViewEntityEntity {
+)
+public class ViewEntityEntity {
@Column(name = "id")
@Id
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewInstanceEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewInstanceEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewInstanceEntity.java
index a66f1bd..6855b56 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewInstanceEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewInstanceEntity.java
@@ -78,7 +78,6 @@ import org.apache.ambari.view.validation.ValidationResult;
table = "ambari_sequences", pkColumnName = "sequence_name", valueColumnName = "sequence_value"
, pkColumnValue = "view_instance_id_seq"
, initialValue = 1
- , allocationSize = 1
)
@Entity
public class ViewInstanceEntity implements ViewInstanceDefinition {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetEntity.java
index 82d9a15..397d845 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetEntity.java
@@ -39,8 +39,7 @@ import java.util.List;
pkColumnName = "sequence_name",
valueColumnName = "sequence_value",
pkColumnValue = "widget_id_seq",
- initialValue = 0,
- allocationSize = 1
+ initialValue = 0
)
@NamedQueries({
@NamedQuery(name = "WidgetEntity.findAll", query = "SELECT widget FROM WidgetEntity widget"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/14cbdabe/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutEntity.java
index 6ba14e4..b25cfcc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutEntity.java
@@ -40,8 +40,7 @@ import java.util.List;
pkColumnName = "sequence_name",
valueColumnName = "sequence_value",
pkColumnValue = "widget_layout_id_seq",
- initialValue = 0,
- allocationSize = 1
+ initialValue = 0
)
@NamedQueries({
@NamedQuery(name = "WidgetLayoutEntity.findAll", query = "SELECT widgetLayout FROM WidgetLayoutEntity widgetLayout"),