Repository: ambari Updated Branches: refs/heads/trunk eace569bd -> d9167bdd6
AMBARI-18014. PXF service definition is missing pxf-json profile. (adenissov) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d9167bdd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d9167bdd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d9167bdd Branch: refs/heads/trunk Commit: d9167bdd68342f31482e5872e80cbf760db60085 Parents: eace569 Author: Alexander Denissov <[email protected]> Authored: Thu Aug 4 16:03:43 2016 -0700 Committer: Alexander Denissov <[email protected]> Committed: Thu Aug 4 16:03:43 2016 -0700 ---------------------------------------------------------------------- .../PXF/3.0.0/configuration/pxf-profiles.xml | 14 ++++++++++++++ .../resources/common-services/PXF/3.0.0/metainfo.xml | 3 +++ .../src/test/python/common-services/PXF/test_pxf.py | 3 +++ .../python/common-services/configs/pxf_default.json | 2 +- 4 files changed, 21 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d9167bdd/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml index 69e3228..3c2aac0 100644 --- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml +++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/configuration/pxf-profiles.xml @@ -157,6 +157,20 @@ under the License. <resolver>org.apache.hawq.pxf.plugins.gemfirexd.GemFireXDResolver</resolver> </plugins> </profile> + <profile> + <name>Json</name> + <description> + Access JSON data either as: + * one JSON record per line (default) + * or multiline JSON records with an IDENTIFIER parameter indicating a member name + used to determine the encapsulating json object to return + </description> + <plugins> + <fragmenter>org.apache.hawq.pxf.plugins.hdfs.HdfsDataFragmenter</fragmenter> + <accessor>org.apache.hawq.pxf.plugins.json.JsonAccessor</accessor> + <resolver>org.apache.hawq.pxf.plugins.json.JsonResolver</resolver> + </plugins> + </profile> </profiles> ]]></value> <value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/d9167bdd/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml b/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml index 5978d0b..d41c030 100644 --- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml @@ -65,6 +65,9 @@ <package> <name>pxf-hbase</name> </package> + <package> + <name>pxf-json</name> + </package> </packages> </osSpecific> </osSpecifics> http://git-wip-us.apache.org/repos/asf/ambari/blob/d9167bdd/ambari-server/src/test/python/common-services/PXF/test_pxf.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/common-services/PXF/test_pxf.py b/ambari-server/src/test/python/common-services/PXF/test_pxf.py index 49df75d..c291261 100644 --- a/ambari-server/src/test/python/common-services/PXF/test_pxf.py +++ b/ambari-server/src/test/python/common-services/PXF/test_pxf.py @@ -88,6 +88,9 @@ class TestPxf(RMFTestCase): self.assertResourceCalled('Package', 'pxf-hbase', retry_count=5, retry_on_repo_unavailability=False) + self.assertResourceCalled('Package', 'pxf-json', + retry_count=5, + retry_on_repo_unavailability=False) self.assert_configure_default() http://git-wip-us.apache.org/repos/asf/ambari/blob/d9167bdd/ambari-server/src/test/python/common-services/configs/pxf_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/common-services/configs/pxf_default.json b/ambari-server/src/test/python/common-services/configs/pxf_default.json index 10cd9a4..90d8e7c 100644 --- a/ambari-server/src/test/python/common-services/configs/pxf_default.json +++ b/ambari-server/src/test/python/common-services/configs/pxf_default.json @@ -17,7 +17,7 @@ "ambari_db_rca_username": "mapred", "java_home": "/usr/jdk64/jdk1.7.0_45", "db_name": "ambari", - "package_list": "[{\"name\":\"pxf-service\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"apache-tomcat\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hive\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hdfs\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hbase\",\"skipUpgrade\":false, \"condition\": \"\"}]" + "package_list": "[{\"name\":\"pxf-service\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"apache-tomcat\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hive\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hdfs\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-hbase\",\"skipUpgrade\":false, \"condition\": \"\"},{\"name\":\"pxf-json\",\"skipUpgrade\":false, \"condition\": \"\"}]" }, "commandType": "EXECUTION_COMMAND", "roleParams": {},
