openstack/deb-sahara
Code Issues Proposed changes

Merge "change to edp.rst"

Browse Source
This commit is contained in:
Jenkins 2014-10-24 01:01:00 +00:00 committed by Gerrit Code Review
commit 8b691e0b92
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
doc/source/userdoc/edp.rst
View File

@ -121,22 +121,22 @@ Specifying Configuration Values, Parameters, and Arguments
Jobs can be configured at launch. The job type determines the kinds of values that may be set:
+--------------------------+--------------+------------+-----------+
| Job type | Configration | Parameters | Arguments |
+--------------------------+---------------+------------+-----------+
| Job type | Configuration | Parameters | Arguments |
| | Values | | |
+==========================+==============+============+===========+
+==========================+===============+============+===========+
| ``Hive`` | Yes | Yes | No |
+--------------------------+--------------+------------+-----------+
+--------------------------+---------------+------------+-----------+
| ``Pig`` | Yes | Yes | Yes |
+--------------------------+--------------+------------+-----------+
+--------------------------+---------------+------------+-----------+
| ``MapReduce`` | Yes | No | No |
+--------------------------+--------------+------------+-----------+
+--------------------------+---------------+------------+-----------+
| ``MapReduce.Streaming`` | Yes | No | No |
+--------------------------+--------------+------------+-----------+
+--------------------------+---------------+------------+-----------+
| ``Java`` | Yes | No | Yes |
+--------------------------+--------------+------------+-----------+
+--------------------------+---------------+------------+-----------+
| ``Spark`` | Yes | No | Yes |
+--------------------------+--------------+------------+-----------+
+--------------------------+---------------+------------+-----------+
* :dfn:`Configuration values` are key/value pairs.
@ -254,7 +254,7 @@ Spark jobs use a special configuration value:
A Spark job will execute the ``main`` method of the specified main class. Values may be passed to
the main method through the ``args`` array. Any arguments set during job launch will be passed to the
program as commandline arguments by *spark-submit*.
program as command-line arguments by *spark-submit*.
Data Source objects are not used with Spark job types. Instead, any input or output paths must be passed to the ``main`` method
as arguments. Remember that Swift paths are not supported for Spark jobs currently.