Repository: ambari Updated Branches: refs/heads/trunk 0ee9f1676 -> a92cac157
AMBARI-11369 Hive Cost Based Optimizer not updating dependent configs in installer. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a92cac15 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a92cac15 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a92cac15 Branch: refs/heads/trunk Commit: a92cac157ba16dbcb61aa75413f19eea66f950f4 Parents: 0ee9f16 Author: aBabiichuk <[email protected]> Authored: Mon May 25 15:39:52 2015 +0300 Committer: aBabiichuk <[email protected]> Committed: Mon May 25 19:06:53 2015 +0300 ---------------------------------------------------------------------- .../HDP/2.2/services/HIVE/configuration/hive-site.xml | 14 ++++++++++++++ .../stacks/HDP/2.2/services/stack_advisor.py | 2 +- .../2.2/services/HIVE/configuration/hive-site.xml | 14 ++++++++++++++ .../stacks/HDPWIN/2.2/services/stack_advisor.py | 2 +- .../python/stacks/2.2/common/test_stack_advisor.py | 2 +- ambari-web/app/data/HDP2.2/hive_properties.js | 1 - 6 files changed, 31 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a92cac15/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml index 2783e1b..30bfdef 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml @@ -764,6 +764,10 @@ limitations under the License. <type>hive-env</type> <name>cost_based_optimizer</name> </property> + <property> + <type>hive-site</type> + <name>hive.cbo.enable</name> + </property> </depends-on> </property> <property> @@ -795,6 +799,10 @@ limitations under the License. <type>hive-env</type> <name>cost_based_optimizer</name> </property> + <property> + <type>hive-site</type> + <name>hive.cbo.enable</name> + </property> </depends-on> </property> @@ -1491,6 +1499,12 @@ limitations under the License. </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <depends-on> + <property> + <type>hive-site</type> + <name>hive.cbo.enable</name> + </property> + </depends-on> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/a92cac15/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py index d9f0778..34d1e26 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py @@ -331,7 +331,7 @@ class HDP22StackAdvisor(HDP21StackAdvisor): hive_cbo_enable = configurations["hive-site"]["properties"]["hive.cbo.enable"] putHiveSiteProperty("hive.stats.fetch.partition.stats", hive_cbo_enable) putHiveSiteProperty("hive.stats.fetch.column.stats", hive_cbo_enable) - putHiveSiteProperty("hive.compute.query.using.stats ", "true") + putHiveSiteProperty("hive.compute.query.using.stats", "true") # Interactive Query putHiveServerProperty("hive.server2.tez.initialize.default.sessions", "false") http://git-wip-us.apache.org/repos/asf/ambari/blob/a92cac15/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml index cb1b2dd..896268f 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml @@ -749,6 +749,10 @@ limitations under the License. <type>hive-env</type> <name>cost_based_optimizer</name> </property> + <property> + <type>hive-site</type> + <name>hive.cbo.enable</name> + </property> </depends-on> </property> <property> @@ -780,6 +784,10 @@ limitations under the License. <type>hive-env</type> <name>cost_based_optimizer</name> </property> + <property> + <type>hive-site</type> + <name>hive.cbo.enable</name> + </property> </depends-on> </property> @@ -1502,6 +1510,12 @@ limitations under the License. </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> + <depends-on> + <property> + <type>hive-site</type> + <name>hive.cbo.enable</name> + </property> + </depends-on> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/a92cac15/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py index 98ec4d5..3f246fb 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py @@ -317,7 +317,7 @@ class HDPWIN22StackAdvisor(HDPWIN21StackAdvisor): hive_cbo_enable = configurations["hive-site"]["properties"]["hive.cbo.enable"] putHiveSiteProperty("hive.stats.fetch.partition.stats", hive_cbo_enable) putHiveSiteProperty("hive.stats.fetch.column.stats", hive_cbo_enable) - putHiveSiteProperty("hive.compute.query.using.stats ", "true") + putHiveSiteProperty("hive.compute.query.using.stats", "true") # Interactive Query putHiveServerProperty("hive.server2.tez.initialize.default.sessions", "false") http://git-wip-us.apache.org/repos/asf/ambari/blob/a92cac15/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py index 834510e..aff1c9e 100644 --- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py @@ -955,7 +955,7 @@ class TestHDP22StackAdvisor(TestCase): 'hive.cbo.enable': 'true', 'hive.compactor.initiator.on': 'false', 'hive.compactor.worker.threads': '0', - 'hive.compute.query.using.stats ': 'true', + 'hive.compute.query.using.stats': 'true', 'hive.enforce.bucketing': 'false', 'hive.exec.dynamic.partition.mode': 'strict', 'hive.exec.failure.hooks': 'org.apache.hadoop.hive.ql.hooks.ATSHook', http://git-wip-us.apache.org/repos/asf/ambari/blob/a92cac15/ambari-web/app/data/HDP2.2/hive_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2.2/hive_properties.js b/ambari-web/app/data/HDP2.2/hive_properties.js index 237b91e..1cdd5a2 100644 --- a/ambari-web/app/data/HDP2.2/hive_properties.js +++ b/ambari-web/app/data/HDP2.2/hive_properties.js @@ -45,7 +45,6 @@ var hivePropsByCategory = { 'hive.vectorized.execution.reduce.enabled', 'hive.vectorized.groupby.checkinterval', 'hive.vectorized.groupby.flush.percent', - 'hive.compute.query.using.stats', 'hive.limit.pushdown.memory.usage', 'hive.optimize.index.filter', 'hive.exec.reducers.bytes.per.reducer',
