Author: jmahonin
Date: Thu Mar 30 19:49:02 2017
New Revision: 1789558
URL: http://svn.apache.org/viewvc?rev=1789558&view=rev
Log:
Add Phoenix 4.10 info phoenix-spark docs
Modified:
phoenix/site/publish/language/datatypes.html
phoenix/site/publish/language/functions.html
phoenix/site/publish/language/index.html
phoenix/site/publish/phoenix_spark.html
phoenix/site/source/src/site/markdown/phoenix_spark.md
Modified: phoenix/site/publish/language/datatypes.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1789558&r1=1789557&r2=1789558&view=diff
==============================================================================
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Thu Mar 30 19:49:02 2017
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2017-03-24
+ Generated by Apache Maven Doxia at 2017-03-30
Rendered using Reflow Maven Skin 1.1.0
(http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
Modified: phoenix/site/publish/language/functions.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1789558&r1=1789557&r2=1789558&view=diff
==============================================================================
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Thu Mar 30 19:49:02 2017
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2017-03-24
+ Generated by Apache Maven Doxia at 2017-03-30
Rendered using Reflow Maven Skin 1.1.0
(http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
Modified: phoenix/site/publish/language/index.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1789558&r1=1789557&r2=1789558&view=diff
==============================================================================
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Thu Mar 30 19:49:02 2017
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2017-03-24
+ Generated by Apache Maven Doxia at 2017-03-30
Rendered using Reflow Maven Skin 1.1.0
(http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
Modified: phoenix/site/publish/phoenix_spark.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_spark.html?rev=1789558&r1=1789557&r2=1789558&view=diff
==============================================================================
--- phoenix/site/publish/phoenix_spark.html (original)
+++ phoenix/site/publish/phoenix_spark.html Thu Mar 30 19:49:02 2017
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2017-03-24
+ Generated by Apache Maven Doxia at 2017-03-30
Rendered using Reflow Maven Skin 1.1.0
(http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
@@ -177,10 +177,11 @@
</div>
<div class="section">
<h4 id="Spark_setup">Spark setup</h4>
- <ol style="list-style-type: decimal">
- <li>To ensure that all requisite Phoenix / HBase platform dependencies are
available on the classpath for the Spark executors and drivers, set both
â<i>spark.executor.extraClassPath</i>â and
â<i>spark.driver.extraClassPath</i>â in spark-defaults.conf to include the
âphoenix-<i><tt><version></tt></i>-client.jarâ Note that for Phoenix
versions 4.7 and 4.8 you must use the
âphoenix-<i><tt><version></tt></i>-client-spark.jarâ</li>
- <li>Add the following dependency to your build:</li>
- </ol>
+ <ul>
+ <li> <p>To ensure that all requisite Phoenix / HBase platform dependencies
are available on the classpath for the Spark executors and drivers, set both
â<i>spark.executor.extraClassPath</i>â and
â<i>spark.driver.extraClassPath</i>â in spark-defaults.conf to include the
âphoenix-<i><tt><version></tt></i>-client.jarâ</p></li>
+ <li> <p>Note that for Phoenix versions 4.7 and 4.8 you must use the
âphoenix-<i><tt><version></tt></i>-client-spark.jarâ. As of Phoenix
4.10, the âphoenix-<i><tt><version></tt></i>-client.jarâ is compiled
against Spark 2.x. If compability with Spark 1.x if needed, you must compile
Phoenix with the <tt>spark16</tt> maven profile. </p></li>
+ <li> <p>To help your IDE, you can add the following <i>provided</i>
dependency to your build:</p></li>
+ </ul>
<div class="source">
<pre><dependency>
<groupId>org.apache.phoenix</groupId>
Modified: phoenix/site/source/src/site/markdown/phoenix_spark.md
URL:
http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/phoenix_spark.md?rev=1789558&r1=1789557&r2=1789558&view=diff
==============================================================================
--- phoenix/site/source/src/site/markdown/phoenix_spark.md (original)
+++ phoenix/site/source/src/site/markdown/phoenix_spark.md Thu Mar 30 19:49:02
2017
@@ -5,7 +5,7 @@ as RDDs or DataFrames, and enables persi
#### Prerequisites
-* Phoenix 4.4.0+
+* Phoenix 4.4.0+
* Spark 1.3.1+ (prebuilt with Hadoop 2.4 recommended)
#### Why not JDBC?
@@ -24,11 +24,13 @@ The choice of which method to use to acc
#### Spark setup
-1. To ensure that all requisite Phoenix / HBase platform dependencies are
available on the classpath
+* To ensure that all requisite Phoenix / HBase platform dependencies are
available on the classpath
for the Spark executors and drivers, set both
'_spark.executor.extraClassPath_' and
'_spark.driver.extraClassPath_' in spark-defaults.conf to include the
'phoenix-_`<version>`_-client.jar'
-Note that for Phoenix versions 4.7 and 4.8 you must use the
'phoenix-_`<version>`_-client-spark.jar'
-2. Add the following dependency to your build:
+
+* Note that for Phoenix versions 4.7 and 4.8 you must use the
'phoenix-_`<version>`_-client-spark.jar'. As of Phoenix 4.10, the
'phoenix-_`<version>`_-client.jar' is compiled against Spark 2.x. If
compability with Spark 1.x if needed, you must compile Phoenix with the
`spark16` maven profile.
+
+* To help your IDE, you can add the following _provided_ dependency to your
build:
```
<dependency>
