This is an automated email from the ASF dual-hosted git repository. swapan pushed a commit to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git
commit d99514d3cde9a7e672862ac3aa950d345a4a5a57 Merge: 26f1e62 4adcb38 Author: swapanshridhar <[email protected]> AuthorDate: Tue Apr 17 10:44:27 2018 -0700 AMBARI-23552. Switch to using Surrogate PK in Ambari DB tables, wherever applicable. .../internal/UpgradePlanResourceProvider.java | 3 +- .../VersionDefinitionResourceProvider.java | 174 ++++++++++----------- .../ambari/server/orm/dao/ClusterServiceDAO.java | 24 +-- .../server/orm/dao/ServiceDesiredStateDAO.java | 10 +- .../ambari/server/orm/dao/ServiceGroupDAO.java | 23 +-- .../server/orm/entities/ClusterServiceEntity.java | 37 ++--- .../orm/entities/ClusterServiceEntityPK.java | 85 ---------- .../server/orm/entities/ConfigGroupEntity.java | 8 +- .../orm/entities/HostConfigMappingEntity.java | 8 +- .../ServiceComponentDesiredStateEntity.java | 12 +- .../server/orm/entities/ServiceConfigEntity.java | 8 +- .../orm/entities/ServiceDependencyEntity.java | 27 ++-- .../orm/entities/ServiceDesiredStateEntity.java | 24 +-- .../orm/entities/ServiceDesiredStateEntityPK.java | 85 ---------- .../orm/entities/ServiceGroupDependencyEntity.java | 29 ++-- .../server/orm/entities/ServiceGroupEntity.java | 16 +- .../server/orm/entities/ServiceGroupEntityPK.java | 71 --------- .../ambari/server/state/ServiceComponentImpl.java | 7 +- .../ambari/server/state/ServiceGroupImpl.java | 47 ++---- .../apache/ambari/server/state/ServiceImpl.java | 54 ++----- .../ambari/server/state/cluster/ClusterImpl.java | 2 +- .../server/state/configgroup/ConfigGroupImpl.java | 4 +- .../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 32 ++-- .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 32 ++-- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 32 ++-- .../main/resources/Ambari-DDL-Postgres-CREATE.sql | 33 ++-- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 32 ++-- .../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 32 ++-- .../internal/ServiceResourceProviderTest.java | 52 ++++-- .../internal/UpgradePlanResourceProviderTest.java | 3 +- 30 files changed, 345 insertions(+), 661 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
