[08/39] ambari git commit: AMBARI-22509 Fix DatabaseConsistencyCheckHelper (dsen)

2017-11-24 Thread adoroszlai 
AMBARI-22509 Fix DatabaseConsistencyCheckHelper (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/99259e50
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99259e50
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99259e50

Branch: refs/heads/branch-feature-AMBARI-14714-blueprintv2
Commit: 99259e5001fc8a055cc0285e5d5945661000c654
Parents: 1f17684
Author: Dmytro Sen 
Authored: Fri Nov 24 12:17:12 2017 +0200
Committer: Dmytro Sen 
Committed: Fri Nov 24 12:17:12 2017 +0200

--
 .../checks/DatabaseConsistencyCheckHelper.java  | 132 --
 .../DatabaseConsistencyCheckHelperTest.java | 178 +++
 2 files changed, 213 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/99259e50/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
index 80f88de..1f57996 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
@@ -901,28 +901,28 @@ public class DatabaseConsistencyCheckHelper {
   static void checkServiceConfigs()  {
 LOG.info("Checking services and their configs");
 
-String GET_SERVICES_WITHOUT_CONFIGS_QUERY = "select c.cluster_name, 
service_name from clusterservices cs " +
+String GET_SERVICES_WITHOUT_CONFIGS_QUERY = "select c.cluster_name, id 
from clusterservices cs " +
 "join clusters c on cs.cluster_id=c.cluster_id " +
-"where service_name not in (select service_name from serviceconfig 
sc where sc.cluster_id=cs.cluster_id and sc.service_name=cs.service_name and 
sc.group_id is null)";
-String GET_SERVICE_CONFIG_WITHOUT_MAPPING_QUERY = "select c.cluster_name, 
sc.service_name, sc.version from serviceconfig sc " +
+"where id not in (select service_id from serviceconfig sc where 
sc.cluster_id=cs.cluster_id and sc.service_id=cs.id and sc.group_id is null)";
+String GET_SERVICE_CONFIG_WITHOUT_MAPPING_QUERY = "select c.cluster_name, 
sc.service_group_id, sc.service_id, sc.version from serviceconfig sc " +
 "join clusters c on sc.cluster_id=c.cluster_id " +
 "where service_config_id not in (select service_config_id from 
serviceconfigmapping) and group_id is null";
 String GET_STACK_NAME_VERSION_QUERY = "select c.cluster_name, 
s.stack_name, s.stack_version from clusters c " +
 "join stack s on c.desired_stack_id = s.stack_id";
-String GET_SERVICES_WITH_CONFIGS_QUERY = "select c.cluster_name, 
cs.service_name, cc.type_name, sc.version from clusterservices cs " +
-"join serviceconfig sc on cs.service_name=sc.service_name and 
cs.cluster_id=sc.cluster_id " +
+String GET_SERVICES_WITH_CONFIGS_QUERY = "select c.cluster_name, cs.id, 
cs.service_type, cc.type_name, sc.version from clusterservices cs " +
+"join serviceconfig sc on cs.id=sc.service_id and 
cs.cluster_id=sc.cluster_id " +
 "join serviceconfigmapping scm on 
sc.service_config_id=scm.service_config_id " +
 "join clusterconfig cc on scm.config_id=cc.config_id and 
sc.cluster_id=cc.cluster_id " +
 "join clusters c on cc.cluster_id=c.cluster_id and 
sc.stack_id=c.desired_stack_id " +
-"where sc.group_id is null and sc.service_config_id=(select 
max(service_config_id) from serviceconfig sc2 where 
sc2.service_name=sc.service_name and sc2.cluster_id=sc.cluster_id) " +
-"group by c.cluster_name, cs.service_name, cc.type_name, 
sc.version";
-String GET_NOT_SELECTED_SERVICE_CONFIGS_QUERY = "select c.cluster_name, 
cs.service_name, cc.type_name from clusterservices cs " +
-"join serviceconfig sc on cs.service_name=sc.service_name and 
cs.cluster_id=sc.cluster_id " +
+"where sc.group_id is null and sc.service_config_id=(select 
max(service_config_id) from serviceconfig sc2 where 
sc2.service_id=sc.service_id and sc2.cluster_id=sc.cluster_id) " +
+"group by c.cluster_name, cs.id, cs.service_type, cc.type_name, 
sc.version";
+String GET_NOT_SELECTED_SERVICE_CONFIGS_QUERY = "select c.cluster_name, 
cs.id, cc.type_name from clusterservices cs " +
+"join serviceconfig sc on cs.id=sc.service_id and 
cs.cluster_id=sc.cluster_id " +
 "join serviceconfigmapping scm on 
sc.service_config_id=scm.service_config_id " +
 "join clusterconfig cc on scm.config_i

ambari git commit: AMBARI-22509 Fix DatabaseConsistencyCheckHelper (dsen)

2017-11-24 Thread dsen 
Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714 1f176845e -> 99259e500


AMBARI-22509 Fix DatabaseConsistencyCheckHelper (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/99259e50
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99259e50
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99259e50

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 99259e5001fc8a055cc0285e5d5945661000c654
Parents: 1f17684
Author: Dmytro Sen 
Authored: Fri Nov 24 12:17:12 2017 +0200
Committer: Dmytro Sen 
Committed: Fri Nov 24 12:17:12 2017 +0200

--
 .../checks/DatabaseConsistencyCheckHelper.java  | 132 --
 .../DatabaseConsistencyCheckHelperTest.java | 178 +++
 2 files changed, 213 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/99259e50/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
index 80f88de..1f57996 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
@@ -901,28 +901,28 @@ public class DatabaseConsistencyCheckHelper {
   static void checkServiceConfigs()  {
 LOG.info("Checking services and their configs");
 
-String GET_SERVICES_WITHOUT_CONFIGS_QUERY = "select c.cluster_name, 
service_name from clusterservices cs " +
+String GET_SERVICES_WITHOUT_CONFIGS_QUERY = "select c.cluster_name, id 
from clusterservices cs " +
 "join clusters c on cs.cluster_id=c.cluster_id " +
-"where service_name not in (select service_name from serviceconfig 
sc where sc.cluster_id=cs.cluster_id and sc.service_name=cs.service_name and 
sc.group_id is null)";
-String GET_SERVICE_CONFIG_WITHOUT_MAPPING_QUERY = "select c.cluster_name, 
sc.service_name, sc.version from serviceconfig sc " +
+"where id not in (select service_id from serviceconfig sc where 
sc.cluster_id=cs.cluster_id and sc.service_id=cs.id and sc.group_id is null)";
+String GET_SERVICE_CONFIG_WITHOUT_MAPPING_QUERY = "select c.cluster_name, 
sc.service_group_id, sc.service_id, sc.version from serviceconfig sc " +
 "join clusters c on sc.cluster_id=c.cluster_id " +
 "where service_config_id not in (select service_config_id from 
serviceconfigmapping) and group_id is null";
 String GET_STACK_NAME_VERSION_QUERY = "select c.cluster_name, 
s.stack_name, s.stack_version from clusters c " +
 "join stack s on c.desired_stack_id = s.stack_id";
-String GET_SERVICES_WITH_CONFIGS_QUERY = "select c.cluster_name, 
cs.service_name, cc.type_name, sc.version from clusterservices cs " +
-"join serviceconfig sc on cs.service_name=sc.service_name and 
cs.cluster_id=sc.cluster_id " +
+String GET_SERVICES_WITH_CONFIGS_QUERY = "select c.cluster_name, cs.id, 
cs.service_type, cc.type_name, sc.version from clusterservices cs " +
+"join serviceconfig sc on cs.id=sc.service_id and 
cs.cluster_id=sc.cluster_id " +
 "join serviceconfigmapping scm on 
sc.service_config_id=scm.service_config_id " +
 "join clusterconfig cc on scm.config_id=cc.config_id and 
sc.cluster_id=cc.cluster_id " +
 "join clusters c on cc.cluster_id=c.cluster_id and 
sc.stack_id=c.desired_stack_id " +
-"where sc.group_id is null and sc.service_config_id=(select 
max(service_config_id) from serviceconfig sc2 where 
sc2.service_name=sc.service_name and sc2.cluster_id=sc.cluster_id) " +
-"group by c.cluster_name, cs.service_name, cc.type_name, 
sc.version";
-String GET_NOT_SELECTED_SERVICE_CONFIGS_QUERY = "select c.cluster_name, 
cs.service_name, cc.type_name from clusterservices cs " +
-"join serviceconfig sc on cs.service_name=sc.service_name and 
cs.cluster_id=sc.cluster_id " +
+"where sc.group_id is null and sc.service_config_id=(select 
max(service_config_id) from serviceconfig sc2 where 
sc2.service_id=sc.service_id and sc2.cluster_id=sc.cluster_id) " +
+"group by c.cluster_name, cs.id, cs.service_type, cc.type_name, 
sc.version";
+String GET_NOT_SELECTED_SERVICE_CONFIGS_QUERY = "select c.cluster_name, 
cs.id, cc.type_name from clusterservices cs " +
+"join serviceconfig sc on cs.id=sc.service_id and 
cs.cluster_id=sc.cluster_id " +
 "join serviceconfigmapping scm on 
sc.serv