Merge "Removed support of Hive 0.12 and Impala 1.2.3 from MapR plugin"

sahara/plugins/mapr/services/hive/hive.py

@@ -112,14 +112,6 @@ class Hive(s.Service):
             r.execute_command(cmd % args, raise_when_error=False)
 
 
-@six.add_metaclass(s.Single)
-class HiveV012(Hive):
-    def __init__(self):
-        super(HiveV012, self).__init__()
-        self._version = '0.12'
-        self._dependencies = [('mapr-hive', self.version)]
-
-
 @six.add_metaclass(s.Single)
 class HiveV013(Hive):
     def __init__(self):

sahara/plugins/mapr/services/impala/impala.py

@@ -76,31 +76,6 @@ class Impala(s.Service):
             cmd.chown(instance, 'mapr:mapr', self.service_dir(cluster_context))
 
 
-@six.add_metaclass(s.Single)
-class ImpalaV123(Impala):
-    def __init__(self):
-        super(ImpalaV123, self).__init__()
-        self._version = '1.2.3'
-        self._dependencies = [
-            ('mapr-hive', hive.HiveV012().version),
-            ('mapr-impala', self.version),
-        ]
-        self._validation_rules = [
-            vu.depends_on(hive.HiveV012(), self),
-            vu.on_same_node(IMPALA_CATALOG, hive.HIVE_SERVER_2),
-            vu.exactly(1, IMPALA_STATE_STORE),
-            vu.exactly(1, IMPALA_CATALOG),
-            vu.at_least(1, IMPALA_SERVER),
-        ]
-
-    def _get_impala_env_props(self, context):
-        return {
-            'impala_version': self.version,
-            'statestore_host': context.get_instance_ip(IMPALA_STATE_STORE),
-            'catalog_host': context.get_instance_ip(IMPALA_CATALOG),
-        }
-
-
 @six.add_metaclass(s.Single)
 class ImpalaV141(Impala):
     def __init__(self):

sahara/plugins/mapr/versions/v3_1_1/version_handler.py

@@ -20,7 +20,6 @@ from sahara.plugins.mapr.services.hbase import hbase
 from sahara.plugins.mapr.services.hive import hive
 from sahara.plugins.mapr.services.httpfs import httpfs
 from sahara.plugins.mapr.services.hue import hue
-from sahara.plugins.mapr.services.impala import impala
 from sahara.plugins.mapr.services.mahout import mahout
 from sahara.plugins.mapr.services.management import management
 from sahara.plugins.mapr.services.mapreduce import mapreduce
@@ -51,7 +50,6 @@ class VersionHandler(bvh.BaseVersionHandler):
             maprfs.MapRFS(),
             management.Management(),
             oozie.OozieV401(),
-            hive.HiveV012(),
             hive.HiveV013(),
             hbase.HBaseV094(),
             hbase.HBaseV0987(),
@@ -65,7 +63,6 @@ class VersionHandler(bvh.BaseVersionHandler):
             drill.DrillV08(),
             drill.DrillV09(),
             sqoop2.Sqoop2(),
-            impala.ImpalaV123(),
             hue.HueV360(),
         ]
 

sahara/plugins/mapr/versions/v4_0_1_mrv1/version_handler.py

@@ -20,7 +20,6 @@ from sahara.plugins.mapr.services.hbase import hbase
 from sahara.plugins.mapr.services.hive import hive
 from sahara.plugins.mapr.services.httpfs import httpfs
 from sahara.plugins.mapr.services.hue import hue
-from sahara.plugins.mapr.services.impala import impala
 from sahara.plugins.mapr.services.mahout import mahout
 from sahara.plugins.mapr.services.management import management
 from sahara.plugins.mapr.services.mapreduce import mapreduce
@@ -31,7 +30,6 @@ from sahara.plugins.mapr.services.sqoop import sqoop2
 from sahara.plugins.mapr.services.swift import swift
 import sahara.plugins.mapr.versions.v4_0_1_mrv1.context as c
 
-
 version = '4.0.1.mrv1'
 
 
@@ -49,7 +47,6 @@ class VersionHandler(bvh.BaseVersionHandler):
             maprfs.MapRFS(),
             management.Management(),
             oozie.OozieV401(),
-            hive.HiveV012(),
             hive.HiveV013(),
             hbase.HBaseV094(),
             hbase.HBaseV0987(),
@@ -65,7 +62,6 @@ class VersionHandler(bvh.BaseVersionHandler):
             drill.DrillV08(),
             drill.DrillV09(),
             sqoop2.Sqoop2(),
-            impala.ImpalaV123(),
             hue.HueV360(),
             hue.HueV370(),
         ]

sahara/plugins/mapr/versions/v4_0_1_mrv2/version_handler.py

@@ -48,7 +48,6 @@ class VersionHandler(bvh.BaseVersionHandler):
             maprfs.MapRFS(),
             management.Management(),
             oozie.OozieV401(),
-            hive.HiveV012(),
             hive.HiveV013(),
             hbase.HBaseV094(),
             hbase.HBaseV0987(),

sahara/plugins/mapr/versions/v4_0_2_mrv1/version_handler.py

@@ -51,7 +51,6 @@ class VersionHandler(bvh.BaseVersionHandler):
             mng.Management(),
             oozie.OozieV401(),
             oozie.OozieV410(),
-            hive.HiveV012(),
             hive.HiveV013(),
             flume.Flume(),
             hbase.HBaseV0987(),

sahara/plugins/mapr/versions/v4_0_2_mrv2/version_handler.py

@@ -51,7 +51,6 @@ class VersionHandler(bvh.BaseVersionHandler):
             mng.Management(),
             oozie.OozieV401(),
             oozie.OozieV410(),
-            hive.HiveV012(),
             hive.HiveV013(),
             impala.ImpalaV141(),
             flume.Flume(),