accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: ACCUMULO-1783 Got a decent enough shell for writing up documentation
Date Sun, 10 Nov 2013 05:19:16 GMT
ACCUMULO-1783 Got a decent enough shell for writing up documentation


Project: http://git-wip-us.apache.org/repos/asf/accumulo-pig/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-pig/commit/2123d940
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-pig/tree/2123d940
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-pig/diff/2123d940

Branch: refs/heads/ACCUMULO-1783
Commit: 2123d940e05407b35f0e98d0bd42c365df7293a2
Parents: 34900d8
Author: Josh Elser <elserj@apache.org>
Authored: Sun Nov 10 00:18:26 2013 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Sun Nov 10 00:18:26 2013 -0500

----------------------------------------------------------------------
 site/_config.yml           |   1 +
 site/_layouts/default.html |  22 ++-----
 site/css/base.css          |   2 +-
 site/docs/introduction.md  |  71 ++++++++++++++++++++
 site/index.html            | 141 +++++++---------------------------------
 5 files changed, 99 insertions(+), 138 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-pig/blob/2123d940/site/_config.yml
----------------------------------------------------------------------
diff --git a/site/_config.yml b/site/_config.yml
index ed98c6b..d9b77c3 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -8,3 +8,4 @@ pygments: true
 auto: true
 baseurl: /
 permalinks: pretty
+relative_permalinks: false

http://git-wip-us.apache.org/repos/asf/accumulo-pig/blob/2123d940/site/_layouts/default.html
----------------------------------------------------------------------
diff --git a/site/_layouts/default.html b/site/_layouts/default.html
index c2bbfe1..0acdd7f 100644
--- a/site/_layouts/default.html
+++ b/site/_layouts/default.html
@@ -5,9 +5,7 @@
         <title>{{ page.title }}</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-        <!--link href="/css/reset.css" rel="stylesheet" type="text/css" /-->
         <link href="/css/base.css" rel="stylesheet" type="text/css" />
-        <!--link href="/css/color.css" rel="stylesheet" type="text/css" /-->
 
         <!--script type="text/javascript">
             var _gaq = _gaq || [];
@@ -24,24 +22,12 @@
     </head>
 
     <body>
-        <!--div id="header">
-            <div id="title">
-                <h1><a href="/">Accumulo Pig</a></h1>
-            </div>
-        </div-->
         <div id="content">
+            <div id="header">
+                <span class="h1">Accumulo storage with Pig</span>
+                <span style="float:right;"><img src="/images/pig.gif" height="70px"
alt="pig" /><img src="/images/accumulo.png" height="70px" alt="accumulo" style="padding-left:15px"/></span>
+            </div>
             {{ content }}
         </div>
-
-            <!--div id="sidebar">
-                <div id="links" class="sidebar_content">
-                </div>
-            </div>
-
-
-            <div id="footer">
-            </div>
-        </div-->
-
     </body>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo-pig/blob/2123d940/site/css/base.css
----------------------------------------------------------------------
diff --git a/site/css/base.css b/site/css/base.css
index 0a20b3f..4f6890f 100644
--- a/site/css/base.css
+++ b/site/css/base.css
@@ -41,7 +41,7 @@ div#content {
     border-top-style: none;
 }
 
-pre.codepre { 
+pre.code { 
     overflow: auto;
     padding-left: 20px;
     padding-top: 15px;

http://git-wip-us.apache.org/repos/asf/accumulo-pig/blob/2123d940/site/docs/introduction.md
----------------------------------------------------------------------
diff --git a/site/docs/introduction.md b/site/docs/introduction.md
new file mode 100644
index 0000000..a46a880
--- /dev/null
+++ b/site/docs/introduction.md
@@ -0,0 +1,71 @@
+---
+layout: default
+title: Accumulo Storage with Pig
+permalink: /docs/introduction/
+---
+[Apache Accumulo](http://accumulo.apache.org) 
+
+<pre class="code">
+<span class="comment">-- Read a reduced set of our flight data</span>
+<span class="variable">flight_data</span> = <span class="keyword">LOAD</span>
<span class="constants">'accumulo://flights?instance=accumulo&amp;user=pig&amp;password=password&amp;zookeepers=localhost&amp;fetch_columns=destination,departure_time,scheduled_departure_time,flight_number,taxi_in,taxi_out,origin'</span>
+<span class="keyword">USING</span> org.apache.accumulo.pig.AccumuloStorage()
<span class="keyword">AS</span> (rowkey:<span class="type">chararray</span>,
data:<span class="type">map[]</span>);
+
+<span class="comment">-- Also read airport information</span>
+<span class="variable">airports</span> = <span class="keyword">LOAD</span>
<span class="constants">'accumulo://airports?instance=accumulo&amp;user=pig&amp;password=password&amp;zookeepers=localhost'</span>
<span class="keyword">USING</span>
+org.apache.accumulo.pig.AccumuloStorage() <span class="keyword">AS</span> (rowkey:<span
class="type">chararray</span>, data:<span class="type">map[]</span>);
+
+<span class="comment">-- Permute the map</span>
+<span class="variable">flight_data</span> = <span class="keyword">FOREACH</span>
<span class="variable">flight_data</span> <span class="keyword">GENERATE</span>
rowkey, data#<span class="constants">'origin'</span> <span class="keyword">AS</span>
origin, data#<span class="constants">'destination'</span> <span class="keyword">AS</span>
destination, data#<span class="constants">'departure_time'</span> <span class="keyword">AS</span>
departure_time,
+data#<span class="constants">'scheduled_departure_time'</span> <span class="keyword">AS</span>
scheduled_departure_time, data#<span class="constants">'flight_number'</span>
<span class="keyword">AS</span> flight_number, data#<span class="constants">'taxi_in'</span>
<span class="keyword">AS</span> taxi_in, data#<span class="constants">'taxi_out'</span>
<span class="keyword">AS</span> taxi_out;
+
+<span class="comment">-- Permute the map</span>
+<span class="variable">airports</span> = <span class="keyword">FOREACH</span>
<span class="variable">airports</span> <span class="keyword">GENERATE</span>
data#<span class="constants">'name'</span> <span class="keyword">AS</span>
name, data#<span class="constants">'state'</span> <span class="keyword">AS</span>
state, data#<span class="constants">'code'</span> <span class="keyword">AS</span>
code, data#<span class="constants">'country'</span> <span class="keyword">AS</span>
country, data#<span class="constants">'city'</span> <span class="keyword">AS</span>
city;
+
+<span class="comment">-- Add airport information about the origin of the flight</span>
+<span class="variable">flights_with_origin</span> = <span class="keyword">JOIN</span>
<span class="variable">flight_data</span> <span class="keyword">BY</span>
origin, <span class="variable">airports</span> <span class="keyword">BY</span>
code;
+
+<span class="comment">-- Store this information back into Accumulo in a new table</span>
+<span class="keyword">STORE</span> <span class="variable">flights_with_origin</span>
<span class="keyword">INTO</span> <span class="constants">'accumulo://flights_with_airports?instance=accumulo1.4&amp;user=root&amp;password=secret&amp;zookeepers=localhost'</span>
\
+<span class="keyword">USING</span> org.apache.accumulo.pig.AccumuloStorage(<span
class="constants">'origin,destination,departure_time,scheduled_departure_time,flight_number,taxi_in,taxi_out,name,state,code,country,city'</span>);
+</pre>
+
+<p> Vestibulum vulputate nisi non imperdiet elementum. Pellentesque at
+consequat nisi. Fusce ut luctus justo. Aenean tincidunt ut risus
+condimentum convallis. Praesent eget tristique risus. Cras pellentesque sed
+libero ac elementum. Quisque tempus commodo neque, laoreet accumsan lectus
+sollicitudin eget. In convallis neque nisi, a iaculis neque interdum ac.
+Suspendisse in ante lacinia dolor faucibus auctor.
+</p>
+
+<p>Nulla fringilla quis turpis a gravida. Quisque tellus arcu, sagittis et sapien
+ut, imperdiet scelerisque est. Duis sapien mi, elementum vitae sem quis, varius
+tincidunt tortor. In commodo semper magna. Donec ultrices nunc est, nec
+volutpat leo porta scelerisque. Praesent tellus leo, scelerisque eget tortor
+eget, posuere sodales nulla. Mauris imperdiet magna eget tristique consequat.
+Nullam adipiscing at arcu in vestibulum. Donec consectetur justo sed odio
+vehicula, vel lobortis libero vehicula. Fusce rutrum justo lorem, sed bibendum
+ipsum ultrices eget. Praesent lobortis justo quis sem adipiscing rutrum ac eget
+nisi. Pellentesque et justo in leo rutrum rhoncus a ut neque. Fusce faucibus,
+orci nec venenatis dapibus, est leo ornare eros, ac adipiscing erat felis sit
+amet tellus. Nulla vehicula ipsum sit amet accumsan tempor.
+</p>
+
+<p>Nulla ac est tincidunt, lacinia quam nec, mollis ante. Nulla ut tincidunt
+massa, vel laoreet elit. Aliquam erat volutpat. Mauris varius dolor in eros
+blandit adipiscing. Nam ultrices tellus quam, eu porta quam varius ac.
+Phasellus in massa fringilla, mattis nisi vel, condimentum diam. Cras porttitor
+eget arcu vel tempor.
+</p>
+
+<p>Ut id vestibulum lorem. Fusce vitae metus sed magna tincidunt vestibulum. Fusce
+in eros ac nulla vestibulum venenatis vitae vitae nisi. Donec elementum neque
+ac viverra cursus. Morbi tincidunt venenatis tellus, id facilisis nibh viverra
+eget. Aenean pellentesque gravida orci, sed elementum nisl vulputate at.
+Suspendisse ut orci vitae tortor viverra egestas id scelerisque ante. Praesent
+vel tempor justo, id tempor lacus. Proin convallis vehicula mauris. Suspendisse
+tincidunt et libero vitae condimentum. Nam arcu urna, sollicitudin nec diam
+congue, ultricies hendrerit mi. Vivamus viverra elit in libero rutrum commodo.
+Ut eget varius arcu, ac venenatis tellus. Quisque rutrum blandit velit in
+sollicitudin. Maecenas nibh purus, consectetur at elementum at, dictum et
+dolor. 
+</p>

http://git-wip-us.apache.org/repos/asf/accumulo-pig/blob/2123d940/site/index.html
----------------------------------------------------------------------
diff --git a/site/index.html b/site/index.html
index 973143a..953c549 100644
--- a/site/index.html
+++ b/site/index.html
@@ -1,130 +1,33 @@
 ---
 layout: default
-title: Accumulo Pig
+title: Accumulo Storage with Pig
 ---
+
 <div id="header">
-<span class="h1">Omg accumuload and pigs?!?</span>
-<span style="float:right;"><img src="images/pig.gif" height="70px" alt="pig" /><img
src="images/accumulo.png" height="70px" alt="accumulo" style="padding-left:15px"/></span>
+    <span class="h1">Accumulo storage with Pig</span>
+    <span style="float:right;"><img src="images/pig.gif" height="70px" alt="pig"
/><img src="images/accumulo.png" height="70px" alt="accumulo" style="padding-left:15px"/></span>
 </div>
 
-<div id="introduction">
-    <p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce ut
-    neque quis magna volutpat mollis ac nec orci. In ut felis quam. Nunc
-    fermentum neque dui, ac consequat risus sodales eget. Morbi consectetur
-    vel ligula nec volutpat. Curabitur tincidunt est sed dapibus euismod.
-    Integer ut urna tempus, pulvinar ante ac, porttitor nisi. Sed
-    ullamcorper sodales est aliquam facilisis. Ut ut sem convallis, sodales
-    massa eget, adipiscing nisl. Integer eget commodo tellus. In convallis
-    leo dui, at sagittis est sagittis a. Vestibulum id neque molestie,
-    ultricies velit in, feugiat diam. Praesent vitae lorem sed elit
-    consectetur lobortis eget eu dui. Suspendisse quis commodo sapien.
-    Nullam semper quis urna ac interdum. Duis a velit sem. 
-    </p>
-
-    <pre class="codepre">
-<span class="comment">-- Read a reduced set of our flight data</span>
-<span class="variable">flight_data</span> = <span class="keyword">LOAD</span>
<span class="constants">'accumulo://flights?instance=accumulo&user=pig&password=password&zookeepers=localhost&fetch_columns=destination,departure_time,scheduled_departure_time,flight_number,taxi_in,taxi_out,origin'</span>
-    <span class="keyword">USING</span> org.apache.accumulo.pig.AccumuloStorage()
<span class="keyword">AS</span> (rowkey:<span class="type">chararray</span>,
data:<span class="type">map[]</span>);
-
-<span class="comment">-- Also read airport information</span>
-<span class="variable">airports</span> = <span class="keyword">LOAD</span>
<span class="constants">'accumulo://airports?instance=accumulo&user=pig&password=password&zookeepers=localhost'</span>
<span class="keyword">USING</span>
-    org.apache.accumulo.pig.AccumuloStorage() <span class="keyword">AS</span>
(rowkey:<span class="type">chararray</span>, data:<span class="type">map[]</span>);
-
-<span class="comment">-- Permute the map</span>
-<span class="variable">flight_data</span> = <span class="keyword">FOREACH</span>
<span class="variable">flight_data</span> <span class="keyword">GENERATE</span>
rowkey, data#<span class="constants">'origin'</span> <span class="keyword">AS</span>
origin, data#<span class="constants">'destination'</span> <span class="keyword">AS</span>
destination, data#<span class="constants">'departure_time'</span> <span class="keyword">AS</span>
departure_time,
-    data#<span class="constants">'scheduled_departure_time'</span> <span class="keyword">AS</span>
scheduled_departure_time, data#<span class="constants">'flight_number'</span>
<span class="keyword">AS</span> flight_number, data#<span class="constants">'taxi_in'</span>
<span class="keyword">AS</span> taxi_in, data#<span class="constants">'taxi_out'</span>
<span class="keyword">AS</span> taxi_out;
-
-<span class="comment">-- Permute the map</span>
-<span class="variable">airports</span> = <span class="keyword">FOREACH</span>
<span class="variable">airports</span> <span class="keyword">GENERATE</span>
data#<span class="constants">'name'</span> <span class="keyword">AS</span>
name, data#<span class="constants">'state'</span> <span class="keyword">AS</span>
state, data#<span class="constants">'code'</span> <span class="keyword">AS</span>
code, data#<span class="constants">'country'</span> <span class="keyword">AS</span>
country, data#<span class="constants">'city'</span. <span class="keyword">AS</span>
city;
-
-<span class="comment">-- Add airport information about the origin of the flight</span>
-<span class="variable">flights_with_origin</span> = <span class="keyword">JOIN</span>
<span class="variable">flight_data</span> <span class="keyword">BY</span>
origin, <span class="variable">airports</span> <span class="keyword">BY</span>
code;
-
-<span class="comment">-- Store this information back into Accumulo in a new table</span>
-<span class="keyword">STORE</span> <span class="variable">flights_with_origin</span>
<span class="keyword">INTO</span> <span class="constants">'accumulo://flights_with_airports?instance=accumulo1.4&user=root&password=secret&zookeepers=localhost'</span>
\
-    <span class="keyword">USING</span> org.apache.accumulo.pig.AccumuloStorage(<span
class="constants">'origin,destination,departure_time,scheduled_departure_time,flight_number,taxi_in,taxi_out,name,state,code,country,city'</span>);
-    </pre>
-
-    <p> Vestibulum vulputate nisi non imperdiet elementum. Pellentesque at
-    consequat nisi. Fusce ut luctus justo. Aenean tincidunt ut risus
-    condimentum convallis. Praesent eget tristique risus. Cras pellentesque sed
-    libero ac elementum. Quisque tempus commodo neque, laoreet accumsan lectus
-    sollicitudin eget. In convallis neque nisi, a iaculis neque interdum ac.
-    Suspendisse in ante lacinia dolor faucibus auctor.
-    </p>
-
-    <p>Nulla fringilla quis turpis a gravida. Quisque tellus arcu, sagittis et sapien
-    ut, imperdiet scelerisque est. Duis sapien mi, elementum vitae sem quis, varius
-    tincidunt tortor. In commodo semper magna. Donec ultrices nunc est, nec
-    volutpat leo porta scelerisque. Praesent tellus leo, scelerisque eget tortor
-    eget, posuere sodales nulla. Mauris imperdiet magna eget tristique consequat.
-    Nullam adipiscing at arcu in vestibulum. Donec consectetur justo sed odio
-    vehicula, vel lobortis libero vehicula. Fusce rutrum justo lorem, sed bibendum
-    ipsum ultrices eget. Praesent lobortis justo quis sem adipiscing rutrum ac eget
-    nisi. Pellentesque et justo in leo rutrum rhoncus a ut neque. Fusce faucibus,
-    orci nec venenatis dapibus, est leo ornare eros, ac adipiscing erat felis sit
-    amet tellus. Nulla vehicula ipsum sit amet accumsan tempor.
-    </p>
-
-    <p>Nulla ac est tincidunt, lacinia quam nec, mollis ante. Nulla ut tincidunt
-    massa, vel laoreet elit. Aliquam erat volutpat. Mauris varius dolor in eros
-    blandit adipiscing. Nam ultrices tellus quam, eu porta quam varius ac.
-    Phasellus in massa fringilla, mattis nisi vel, condimentum diam. Cras porttitor
-    eget arcu vel tempor.
-    </p>
-
-    <p>Ut id vestibulum lorem. Fusce vitae metus sed magna tincidunt vestibulum. Fusce
-    in eros ac nulla vestibulum venenatis vitae vitae nisi. Donec elementum neque
-    ac viverra cursus. Morbi tincidunt venenatis tellus, id facilisis nibh viverra
-    eget. Aenean pellentesque gravida orci, sed elementum nisl vulputate at.
-    Suspendisse ut orci vitae tortor viverra egestas id scelerisque ante. Praesent
-    vel tempor justo, id tempor lacus. Proin convallis vehicula mauris. Suspendisse
-    tincidunt et libero vitae condimentum. Nam arcu urna, sollicitudin nec diam
-    congue, ultricies hendrerit mi. Vivamus viverra elit in libero rutrum commodo.
-    Ut eget varius arcu, ac venenatis tellus. Quisque rutrum blandit velit in
-    sollicitudin. Maecenas nibh purus, consectetur at elementum at, dictum et
-    dolor. 
-    </p>
-</div>
-<p/>
-    <!--
-    <div id="posts">
-    {% for post in paginator.posts %}
-        <div class="post">
-            <div class="title">
-                <h3 class="title"><a href="{{ post.url }}">{{ post.title }}</a></h3>
-            </div>
+<p> 
+    <a href="http://accumulo.apache.org">Apache Accumulo</a> is a sorted, distributed,
key-value store built using <a href="http://hadoop.apache.org">Apache
+        Hadoop</a> and <a href="http://zookeeper.apache.org">Apache ZooKeeper</a>.
<a href="http://pig.apache.org">Apache Pig</a> is a platform for analyzing
+    large data sets using a high-level expression language, <em>Pig Latin</em>.
This project intends to provide the mechanisms for storage and retrieval of data stored in
Accumulo
+    using Pig's expression language
+</p>
 
-            <div class="content">
-                {{ post.content }}
-            </div>
+<p>
+    This work was initially based on a contribution by Jason Trost to Apache Accumulo, but
has been recently revitalized to ensure compatibility with all stable
+versions of Apache Accumulo as well as supporting as much of Pig Latin's functionality as
efficiently as possible.
+</p>
 
-            <div class="pre_footer"></div>
 
-            <div class="post_footer">
-                <p>Posted: {{ post.date | date_to_string }}</p>
-            </div>
-        </div>
-    {% endfor %}
-    </div>
-    -->
+<p>
+The code can be viewed at <a href="http://git-wip-us.apache.org/repos/asf?p=accumulo-pig.git">accumulo-pig.git</a>
or can be cloned using <a
+    href="http://git-scm.com">Git</a>
 
-    <!--
-    {% if paginator.total_pages > 1 %}
-        <!-- Pagination links -->
-        <div class="pagination">
-        {% if paginator.previous_page %}
-            {% if paginator.previous_page == 1 %}
-            <a href="/" class="previous">Previous</a>
-            {% else %}
-            <a href="/page{{paginator.previous_page}}" class="previous">Previous</a>
-            {% endif %}
-        {% endif %}
-        <span class="page_number ">{{paginator.page}} of {{paginator.total_pages}}</span>
-        {% if paginator.next_page %}
-            <a href="/page{{paginator.next_page}}" class="next ">Next</a>
-        {% endif %}
-        </div>
-    {% endif %}
-    -->
+<pre class="code" style="padding-bottom:15px; width: auto">
+git clone https://git-wip-us.apache.org/repos/asf/accumulo-pig.git
+</pre>
+</p>
 
+<p>If you're interested, please continue on to the <a href="docs/introduction">introduction</a>.</p.


Mime
View raw message