You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by je...@apache.org on 2014/03/18 00:14:52 UTC
svn commit: r1578657 - in /incubator/phoenix/site: publish/
source/src/site/markdown/
Author: jeffreyz
Date: Mon Mar 17 23:14:51 2014
New Revision: 1578657
URL: http://svn.apache.org/r1578657
Log:
replace script from .sh to .py & add branch descriptions
Modified:
incubator/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html
incubator/phoenix/site/publish/building.html
incubator/phoenix/site/publish/download.html
incubator/phoenix/site/publish/faq.html
incubator/phoenix/site/publish/mr_dataload.html
incubator/phoenix/site/publish/tuning.html
incubator/phoenix/site/source/src/site/markdown/Phoenix-in-15-minutes-or-less.md
incubator/phoenix/site/source/src/site/markdown/building.md
incubator/phoenix/site/source/src/site/markdown/download.md
incubator/phoenix/site/source/src/site/markdown/faq.md
incubator/phoenix/site/source/src/site/markdown/mr_dataload.md
incubator/phoenix/site/source/src/site/markdown/tuning.md
Modified: incubator/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original)
+++ incubator/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Mon Mar 17 23:14:51 2014
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-17
Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
@@ -160,11 +160,11 @@
</div></li>
<li> <p>Execute the following command from a command terminal </p>
<div>
- <pre><tt>./psql.sh <your_zookeeper_quorum> us_population.sql us_population.csv us_population_queries.sql </tt></pre>
+ <pre><tt>./psql.py <your_zookeeper_quorum> us_population.sql us_population.csv us_population_queries.sql </tt></pre>
</div></li>
</ul>
<p>Congratulations! Youâve just created your first Phoenix table, inserted data into it, and executed an aggregate query with just a few lines of code in 15 minutes or less! </p>
-<p><i><b>Big deal - 10 rows! What else you got?</b></i><br /> Ok, ok - tough crowd. Check out our <tt>bin/performance.sh</tt> script to create as many rows as you want, for any schema you come up with, and run timed queries against it.</p>
+<p><i><b>Big deal - 10 rows! What else you got?</b></i><br /> Ok, ok - tough crowd. Check out our <tt>bin/performance.py</tt> script to create as many rows as you want, for any schema you come up with, and run timed queries against it.</p>
<p><i><b>Why is it called Phoenix anyway? Did some other project crash and burn and this is the next generation?</b></i><br /> Iâm sorry, but weâre out of time and space, so weâll have to answer that next time!</p>
<p>Thanks for your time,<br /> James Taylor<br /> <a class="externalLink" href="http://phoenix-hbase.blogspot.com/">http://phoenix-hbase.blogspot.com/</a> <br /> @JamesPlusPlus<br /></p>
</div>
Modified: incubator/phoenix/site/publish/building.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/building.html?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/publish/building.html (original)
+++ incubator/phoenix/site/publish/building.html Mon Mar 17 23:14:51 2014
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2014-03-14
+ Generated by Apache Maven Doxia at 2014-03-17
Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
@@ -130,6 +130,11 @@
<pre> $ mvn package -DskipTests
</pre>
</div>
+<p>To build against hadoop2, you can do:</p>
+<div class="source">
+ <pre> $ mvn package -DskipTests -Dhadoop.profile=2
+</pre>
+</div>
<p>To run all tests including long running integration tests</p>
<div class="source">
<pre> $ mvn install
@@ -166,6 +171,10 @@
</dependencies>
</pre>
</div>
+</div>
+<div class="section">
+ <h2 id="Branches">Branches</h2>
+ <p>Phoenix 3.0 is running against hbase0.94+, Phoenix 4.0 is running against hbase0.98.1+ and Phoenix master branch is running against hbase trunk branch.</p>
</div>
</div>
</div>
Modified: incubator/phoenix/site/publish/download.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/download.html?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/publish/download.html (original)
+++ incubator/phoenix/site/publish/download.html Mon Mar 17 23:14:51 2014
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2014-03-14
+ Generated by Apache Maven Doxia at 2014-03-17
Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
@@ -140,21 +140,21 @@
<h4 id="Command_Line">Command Line</h4>
<p>A terminal interface to execute SQL from the command line is now bundled with Phoenix. To start it, execute the following from the bin directory:</p>
<div class="source">
- <pre>$ sqlline.sh localhost
+ <pre>$ sqlline.py localhost
</pre>
</div>
<p>To execute SQL scripts from the command line, you can include a SQL file argument like this:</p>
<div class="source">
- <pre>$ sqlline.sh localhost ../examples/stock_symbol.sql
+ <pre>$ sqlline.py localhost ../examples/stock_symbol.sql
</pre>
</div>
<p><img src="images/sqlline.png" alt="sqlline" /></p>
<p>For more information, see the <a class="externalLink" href="http://www.hydromatic.net/sqlline/manual.html">manual</a>.</p>
<div class="section">
<h5 id="Loading_Data">Loading Data</h5>
- <p>In addition, you can use the bin/psql.sh to load CSV data or execute SQL scripts. For example:</p>
+ <p>In addition, you can use the bin/psql.py to load CSV data or execute SQL scripts. For example:</p>
<div class="source">
- <pre> $ psql.sh localhost ../examples/web_stat.sql ../examples/web_stat.csv ../examples/web_stat_queries.sql
+ <pre> $ psql.py localhost ../examples/web_stat.sql ../examples/web_stat.csv ../examples/web_stat_queries.sql
</pre>
</div>
<p>Other alternatives include:</p>
Modified: incubator/phoenix/site/publish/faq.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/faq.html?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/publish/faq.html (original)
+++ incubator/phoenix/site/publish/faq.html Mon Mar 17 23:14:51 2014
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-17
Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
@@ -138,7 +138,7 @@
<p><i>Pre-requisite:</i> Download latest Phoenix from <a href="download.html">here</a> and copy phoenix-*.jar to HBase lib folder and restart HBase.</p>
<p><b>1. Using console</b></p>
<ol style="list-style-type: decimal">
- <li>Start Sqlline: <tt>$ sqlline.sh [zookeeper]</tt></li>
+ <li>Start Sqlline: <tt>$ sqlline.py [zookeeper]</tt></li>
<li>Execute the following statements when Sqlline connects:</li>
</ol>
<div class="source">
@@ -207,8 +207,8 @@ public class test {
<p>See the example <a href="mr_dataload.html">here</a> Credit: Arun Singh</p>
<p><b>CSV</b></p>
<p>CSV data can be bulk loaded with built in utility named psql. Typical upsert rates are 20K - 50K rows per second (depends on how wide are the rows).</p>
- <p>Usage example:<br />Create table using psql <tt>$ psql.sh [zookeeper] ../examples/web_stat.sql</tt> </p>
- <p>Upsert CSV bulk data <tt>$ psql.sh [zookeeper] ../examples/web_stat.csv</tt></p>
+ <p>Usage example:<br />Create table using psql <tt>$ psql.py [zookeeper] ../examples/web_stat.sql</tt> </p>
+ <p>Upsert CSV bulk data <tt>$ psql.py [zookeeper] ../examples/web_stat.csv</tt></p>
</div>
<div class="section">
<h3 id="How_I_create_Views_in_Phoenix_Whats_the_difference_between_ViewsTables">How I create Views in Phoenix? Whatâs the difference between Views/Tables?</h3>
Modified: incubator/phoenix/site/publish/mr_dataload.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/mr_dataload.html?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/publish/mr_dataload.html (original)
+++ incubator/phoenix/site/publish/mr_dataload.html Mon Mar 17 23:14:51 2014
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-17
Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
@@ -172,10 +172,10 @@
<ol style="list-style-type: decimal">
<li> <p>Please make sure that Hadoop cluster is working correctly and you are able to run any job like <a class="externalLink" href="http://wiki.apache.org/hadoop/WordCount">this</a>.</p></li>
<li> <p>Copy latest phoenix-[version].jar to hadoop/lib folder on each node or add it to Hadoop classpath.</p></li>
- <li> <p>Run the bulk loader job using the script /bin/csv-bulk-loader.sh as below:</p></li>
+ <li> <p>Run the bulk loader job using the script /bin/csv-bulk-loader.py as below:</p></li>
</ol>
<div class="source">
- <pre>./csv-bulk-loader.sh <option value>
+ <pre>./csv-bulk-loader.py <option value>
<option> <value>
-i CSV data file path in hdfs (mandatory)
@@ -193,7 +193,7 @@
</div>
<p>Example</p>
<div class="source">
- <pre>./csv-bulk-loader.sh -i hdfs://server:9000/mydir/data.csv -s ns -t example -sql ~/Documents/createTable.sql -zk server:2181 -hd hdfs://server:9000 -mr server:9001
+ <pre>./csv-bulk-loader.py -i hdfs://server:9000/mydir/data.csv -s ns -t example -sql ~/Documents/createTable.sql -zk server:2181 -hd hdfs://server:9000 -mr server:9001
</pre>
</div>
<p>This would create the phoenix table âns.exampleâ as specified in createTable.sql and will then load the CSV data from the file âdata.csvâ located in HDFS into the table.</p>
Modified: incubator/phoenix/site/publish/tuning.html
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/publish/tuning.html?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/publish/tuning.html (original)
+++ incubator/phoenix/site/publish/tuning.html Mon Mar 17 23:14:51 2014
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
- Generated by Apache Maven Doxia at 2014-03-12
+ Generated by Apache Maven Doxia at 2014-03-17
Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
-->
<html xml:lang="en" lang="en">
@@ -291,14 +291,14 @@
</div>
</div>
<div class="section">
- <h3 id="Measuring_Performance"> Measuring Performance</h3> One way to get a feeling for how to configure these properties is to use the performance.sh shell script provided in the bin directory of the installation tar.
+ <h3 id="Measuring_Performance"> Measuring Performance</h3> One way to get a feeling for how to configure these properties is to use the performance.py shell script provided in the bin directory of the installation tar.
<br />
<br />
<b>Usage: </b>
- <tt>performance.sh <zookeeper> <row count></tt>
+ <tt>performance.py <zookeeper> <row count></tt>
<br />
<b>Example: </b>
- <tt>performance.sh localhost 1000000</tt>
+ <tt>performance.py localhost 1000000</tt>
<br />
<br /> This will create a new table named
<tt>performance_1000000</tt> and upsert 1000000 rows. The schema and data generated is similar to
@@ -311,7 +311,7 @@
</ul> For convenience, an
<tt>hbase-site.xml</tt> file is included in the bin directory and pre-configured to already be on the classpath during script execution.
<br />
- <br /> Here is a screenshot of the performance.sh script in action:
+ <br /> Here is a screenshot of the performance.py script in action:
<br />
<a class="externalLink" href="http://1.bp.blogspot.com/-VhinivNOJmI/URWBGLYTiHI/AAAAAAAAAQU/Dp9lbH2CxYE/s1600/performance_script.png" style="margin-left: 1em; margin-right: 1em;" rel="lightbox[page]"><img src="http://1.bp.blogspot.com/-VhinivNOJmI/URWBGLYTiHI/AAAAAAAAAQU/Dp9lbH2CxYE/s640/performance_script.png" border="0" height="640" width="497" alt="" /></a>
</div>
Modified: incubator/phoenix/site/source/src/site/markdown/Phoenix-in-15-minutes-or-less.md
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/source/src/site/markdown/Phoenix-in-15-minutes-or-less.md?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/source/src/site/markdown/Phoenix-in-15-minutes-or-less.md (original)
+++ incubator/phoenix/site/source/src/site/markdown/Phoenix-in-15-minutes-or-less.md Mon Mar 17 23:14:51 2014
@@ -68,13 +68,13 @@ ORDER BY sum(population) DESC;
</code></pre>
* Execute the following command from a command terminal
-<pre><code>./psql.sh <your_zookeeper_quorum> us_population.sql us_population.csv us_population_queries.sql
+<pre><code>./psql.py <your_zookeeper_quorum> us_population.sql us_population.csv us_population_queries.sql
</code></pre>
Congratulations! You've just created your first Phoenix table, inserted data into it, and executed an aggregate query with just a few lines of code in 15 minutes or less!
*<strong>Big deal - 10 rows! What else you got?</strong>*<br/>
-Ok, ok - tough crowd. Check out our <code>bin/performance.sh</code> script to create as many rows as you want, for any schema you come up with, and run timed queries against it.
+Ok, ok - tough crowd. Check out our <code>bin/performance.py</code> script to create as many rows as you want, for any schema you come up with, and run timed queries against it.
*<strong>Why is it called Phoenix anyway? Did some other project crash and burn and this is the next generation?</strong>*<br/>
I'm sorry, but we're out of time and space, so we'll have to answer that next time!
Modified: incubator/phoenix/site/source/src/site/markdown/building.md
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/source/src/site/markdown/building.md?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/source/src/site/markdown/building.md (original)
+++ incubator/phoenix/site/source/src/site/markdown/building.md Mon Mar 17 23:14:51 2014
@@ -14,6 +14,12 @@ To build, but skip running the fast unit
$ mvn package -DskipTests
```
+To build against hadoop2, you can do:
+
+```
+ $ mvn package -DskipTests -Dhadoop.profile=2
+```
+
To run all tests including long running integration tests
```
@@ -53,3 +59,7 @@ Phoenix is also hosted at Apache Maven R
...
</dependencies>
```
+
+## Branches ##
+Phoenix 3.0 is running against hbase0.94+, Phoenix 4.0 is running against hbase0.98.1+ and Phoenix master branch is running against hbase trunk branch.
+
Modified: incubator/phoenix/site/source/src/site/markdown/download.md
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/source/src/site/markdown/download.md?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/source/src/site/markdown/download.md (original)
+++ incubator/phoenix/site/source/src/site/markdown/download.md Mon Mar 17 23:14:51 2014
@@ -17,11 +17,11 @@ Wanted to get started quickly? Take a lo
A terminal interface to execute SQL from the command line is now bundled with Phoenix. To start it, execute the following from the bin directory:
- $ sqlline.sh localhost
+ $ sqlline.py localhost
To execute SQL scripts from the command line, you can include a SQL file argument like this:
- $ sqlline.sh localhost ../examples/stock_symbol.sql
+ $ sqlline.py localhost ../examples/stock_symbol.sql
@@ -29,9 +29,9 @@ For more information, see the [manual](h
<h5>Loading Data</h5>
-In addition, you can use the bin/psql.sh to load CSV data or execute SQL scripts. For example:
+In addition, you can use the bin/psql.py to load CSV data or execute SQL scripts. For example:
- $ psql.sh localhost ../examples/web_stat.sql ../examples/web_stat.csv ../examples/web_stat_queries.sql
+ $ psql.py localhost ../examples/web_stat.sql ../examples/web_stat.csv ../examples/web_stat_queries.sql
Other alternatives include:
Modified: incubator/phoenix/site/source/src/site/markdown/faq.md
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/source/src/site/markdown/faq.md?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/source/src/site/markdown/faq.md (original)
+++ incubator/phoenix/site/source/src/site/markdown/faq.md Mon Mar 17 23:14:51 2014
@@ -20,7 +20,7 @@ and copy phoenix-*.jar to HBase lib fold
**1. Using console**
-1. Start Sqlline: `$ sqlline.sh [zookeeper]`
+1. Start Sqlline: `$ sqlline.py [zookeeper]`
2. Execute the following statements when Sqlline connects:
```
@@ -104,10 +104,10 @@ CSV data can be bulk loaded with built i
Usage example:
Create table using psql
-`$ psql.sh [zookeeper] ../examples/web_stat.sql`
+`$ psql.py [zookeeper] ../examples/web_stat.sql`
Upsert CSV bulk data
-`$ psql.sh [zookeeper] ../examples/web_stat.csv`
+`$ psql.py [zookeeper] ../examples/web_stat.csv`
Modified: incubator/phoenix/site/source/src/site/markdown/mr_dataload.md
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/source/src/site/markdown/mr_dataload.md?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/source/src/site/markdown/mr_dataload.md (original)
+++ incubator/phoenix/site/source/src/site/markdown/mr_dataload.md Mon Mar 17 23:14:51 2014
@@ -31,10 +31,10 @@ Phoenix v 2.1 provides support for loadi
2. Copy latest phoenix-[version].jar to hadoop/lib folder on each node or add it to Hadoop classpath.
-3. Run the bulk loader job using the script /bin/csv-bulk-loader.sh as below:
+3. Run the bulk loader job using the script /bin/csv-bulk-loader.py as below:
```
-./csv-bulk-loader.sh <option value>
+./csv-bulk-loader.py <option value>
<option> <value>
-i CSV data file path in hdfs (mandatory)
@@ -52,7 +52,7 @@ Phoenix v 2.1 provides support for loadi
Example
```
-./csv-bulk-loader.sh -i hdfs://server:9000/mydir/data.csv -s ns -t example -sql ~/Documents/createTable.sql -zk server:2181 -hd hdfs://server:9000 -mr server:9001
+./csv-bulk-loader.py -i hdfs://server:9000/mydir/data.csv -s ns -t example -sql ~/Documents/createTable.sql -zk server:2181 -hd hdfs://server:9000 -mr server:9001
```
This would create the phoenix table "ns.example" as specified in createTable.sql and will then load the CSV data from the file "data.csv" located in HDFS into the table.
Modified: incubator/phoenix/site/source/src/site/markdown/tuning.md
URL: http://svn.apache.org/viewvc/incubator/phoenix/site/source/src/site/markdown/tuning.md?rev=1578657&r1=1578656&r2=1578657&view=diff
==============================================================================
--- incubator/phoenix/site/source/src/site/markdown/tuning.md (original)
+++ incubator/phoenix/site/source/src/site/markdown/tuning.md Mon Mar 17 23:14:51 2014
@@ -107,10 +107,10 @@ An important HBase configuration propert
On the DML side of the fence, performance may improve by turning the connection auto commit to on for multi-row mutations such as those that can occur with <code>DELETE</code> and <code>UPSERT SELECT</code>. In this case, if possible, the mutation will be performed completely on the server side without returning data back to the client. However, when performing single row mutations, such as <code>UPSERT VALUES</code>, the opposite is true: auto commit should be off and a reasonable number of rows should be batched together for a single commit to reduce RPC traffic.<br />
<h3>
Measuring Performance</h3>
-One way to get a feeling for how to configure these properties is to use the performance.sh shell script provided in the bin directory of the installation tar.<br />
+One way to get a feeling for how to configure these properties is to use the performance.py shell script provided in the bin directory of the installation tar.<br />
<br />
-<b>Usage: </b><code>performance.sh <zookeeper> <row count></code><br />
-<b>Example: </b><code>performance.sh localhost 1000000</code><br />
+<b>Usage: </b><code>performance.py <zookeeper> <row count></code><br />
+<b>Example: </b><code>performance.py localhost 1000000</code><br />
<br />
This will create a new table named <code>performance_1000000</code> and upsert 1000000 rows. The schema and data generated is similar to <code>examples/web_stat.sql</code> and <code>examples/web_stat.csv</code>. On the console it will measure the time it takes to:<br />
<ul>
@@ -119,7 +119,7 @@ This will create a new table named <code
</ul>
For convenience, an <code>hbase-site.xml</code> file is included in the bin directory and pre-configured to already be on the classpath during script execution.<br />
<br />
-Here is a screenshot of the performance.sh script in action:<br />
+Here is a screenshot of the performance.py script in action:<br />
<div class="separator" style="clear: both; text-align: center;">
<a href="http://1.bp.blogspot.com/-VhinivNOJmI/URWBGLYTiHI/AAAAAAAAAQU/Dp9lbH2CxYE/s1600/performance_script.png" imageanchor="1" style="margin-left: 1em; margin-right: 1em;"><img border="0" height="640" src="http://1.bp.blogspot.com/-VhinivNOJmI/URWBGLYTiHI/AAAAAAAAAQU/Dp9lbH2CxYE/s640/performance_script.png" width="497" /></a></div>
<h3>