You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ts...@apache.org on 2015/05/22 20:30:51 UTC

[01/12] drill git commit: adenache's pull request fix version in 047-installing-drill-on-the-cluster.md

Repository: drill
Updated Branches:
  refs/heads/gh-pages 5808b09da -> 45c29be75


adenache's pull request fix version in 047-installing-drill-on-the-cluster.md


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/45116b0a
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/45116b0a
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/45116b0a

Branch: refs/heads/gh-pages
Commit: 45116b0ac8b3630d59664e13bb278e73b7a35f33
Parents: 2070bbe
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu May 21 17:17:14 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu May 21 17:17:14 2015 -0700

----------------------------------------------------------------------
 _docs/install/047-installing-drill-on-the-cluster.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/45116b0a/_docs/install/047-installing-drill-on-the-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/install/047-installing-drill-on-the-cluster.md b/_docs/install/047-installing-drill-on-the-cluster.md
index ac224b5..1045878 100644
--- a/_docs/install/047-installing-drill-on-the-cluster.md
+++ b/_docs/install/047-installing-drill-on-the-cluster.md
@@ -9,7 +9,7 @@ Complete the following steps to install Drill on designated nodes:
         curl http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz
   2. Explode the tarball to the directory of your choice, such as `/opt`:
   
-        tar -xzvf apache-drill-0.9.0.tar.gz -C /opt
+        tar -xzvf apache-drill-1.0.0.tar.gz
   3. In `drill-override.conf,` create a unique Drill `cluster ID`, and provide Zookeeper host names and port numbers to configure a connection to your Zookeeper quorum.
      1. Edit `drill-override.conf` located in the `/conf` directory.
      2. Provide a unique `cluster-id` and the Zookeeper host names and port numbers in `zk.connect`. If you install Drill on multiple nodes, assign the same `cluster ID` to each Drill node so that all Drill nodes share the same ID. The default Zookeeper port is 2181.


[06/12] drill git commit: Chris Westin's Fixes for the Tutorials TOC and Drill in 10 Minutes pull request

Posted by ts...@apache.org.
Chris Westin's Fixes for the Tutorials TOC and Drill in 10 Minutes pull request


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/72b6615b
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/72b6615b
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/72b6615b

Branch: refs/heads/gh-pages
Commit: 72b6615b8e88845615111a055be7dc7cb994f2ea
Parents: 5c42816
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu May 21 18:43:09 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu May 21 18:43:09 2015 -0700

----------------------------------------------------------------------
 ...20-installing-drill-on-linux-and-mac-os-x.md |  7 ++-
 .../020-querying-parquet-files.md               | 27 ++--------
 _docs/tutorials/020-drill-in-10-minutes.md      | 40 +++++---------
 .../030-analyzing-the-yelp-academic-dataset.md  | 56 ++++++++------------
 4 files changed, 44 insertions(+), 86 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/72b6615b/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md b/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
index 51c80fe..492c218 100755
--- a/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
+++ b/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
@@ -6,9 +6,12 @@ First, check that you [meet the prerequisites]({{site.baseurl}}/docs/embedded-mo
 
 Complete the following steps to install Drill:  
 
-1. Issue the following command in a terminal to download the latest, stable version of Apache Drill to a directory on your machine, or download Drill from the [Drill web site](http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz):
+1. In a terminal windows, change to the directory where you want to install Drill.
 
-        wget http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz  
+2. one of the following two commands (some systems will have wget, and some will have curl) to download the latest version of Apache Drill, or download Drill from the [Drill web site](http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz):
+
+   * `wget http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz`  
+   *  `curl -o apache-drill-1.0.0.tar.gz http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz`  
 
 2. Copy the downloaded file to the directory where you want to install Drill. 
 

http://git-wip-us.apache.org/repos/asf/drill/blob/72b6615b/_docs/query-data/query-a-file-system/020-querying-parquet-files.md
----------------------------------------------------------------------
diff --git a/_docs/query-data/query-a-file-system/020-querying-parquet-files.md b/_docs/query-data/query-a-file-system/020-querying-parquet-files.md
index 3731f65..df14662 100644
--- a/_docs/query-data/query-a-file-system/020-querying-parquet-files.md
+++ b/_docs/query-data/query-a-file-system/020-querying-parquet-files.md
@@ -12,20 +12,9 @@ The examples assume that Drill was [installed in embedded mode]({{ site.baseurl
 
 ## Region File
 
-To view the data in the `region.parquet` file, issue the query appropriate for
-your operating system:
-
-  * Linux  
-    
-        SELECT * FROM dfs.`/opt/drill/apache-drill-1.0.0/sample-data/region.parquet`;
+To view the data in the `region.parquet` file, issue the following query:
 
-  * Mac OS X  
-        
-        SELECT * FROM dfs.`/Users/max/drill/apache-drill-1.0.0/sample-data/region.parquet`;
-
-  * Windows  
-    
-        SELECT * FROM dfs.`C:\drill\apache-drill-1.0.0\sample-data\region.parquet`;
+        SELECT * FROM dfs.`<path-to-installation>/apache-drill-<version>\sample-data\region.parquet`;
 
 The query returns the following results:
 
@@ -49,17 +38,7 @@ systems.
 To view the data in the `nation.parquet` file, issue the query appropriate for
 your operating system:
 
-  * Linux  
-  
-        SELECT * FROM dfs.`/opt/drill/apache-drill-1.0.0/sample-data/nation.parquet`;
-
-  * Mac OS X  
-
-        SELECT * FROM dfs.`/Users/max/drill/apache-drill-1.0.0-incubating/sample-data/nation.parquet`;
-
-  * Windows  
-
-        SELECT * FROM dfs.`C:\drill\apache-drill-1.0.0-incubating\sample-data\nation.parquet`;
+        SELECT * FROM dfs.`<path-to-installation>/apache-drill-<version>/apache-drill-1.0.0/sample-data/nation.parquet`;
 
 The query returns the following results:
 

http://git-wip-us.apache.org/repos/asf/drill/blob/72b6615b/_docs/tutorials/020-drill-in-10-minutes.md
----------------------------------------------------------------------
diff --git a/_docs/tutorials/020-drill-in-10-minutes.md b/_docs/tutorials/020-drill-in-10-minutes.md
index a0b6203..4ce8848 100755
--- a/_docs/tutorials/020-drill-in-10-minutes.md
+++ b/_docs/tutorials/020-drill-in-10-minutes.md
@@ -43,13 +43,16 @@ The output looks something like this:
 
 Complete the following steps to install Drill:  
 
-1. Issue the following command in a terminal to download the latest version of Apache Drill to a directory on your machine, or download Drill from the [Drill web site](http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz):
+1. In a terminal windows, change to the directory where you want to install Drill.
 
-        wget http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz  
+2. To download the latest version of Apache Drill, download Drill from the [Drill web site](http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz)or run one of the following commands, depending on which you have installed on your system:
 
-2. Copy the downloaded file to the directory where you want to install Drill. 
+   * `wget http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz`  
+   *  `curl -o apache-drill-1.0.0.tar.gz http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz`  
 
-3. Extract the contents of the Drill tar.gz file. Use sudo if necessary:  
+3. Copy the downloaded file to the directory where you want to install Drill. 
+
+4. Extract the contents of the Drill tar.gz file. Use sudo if necessary:  
 
         sudo tar -xvzf apache-drill-1.0.0.tar.gz  
 
@@ -107,7 +110,7 @@ Issue the following command when you want to exit the Drill shell:
 
 ## Query Sample Data
 
-Your Drill installation includes a `sample-date` directory with JSON and
+Your Drill installation includes a `sample-data` directory with JSON and
 Parquet files that you can query. The local file system on your machine is
 configured as the `dfs` storage plugin instance by default when you install
 Drill in embedded mode. For more information about storage plugin
@@ -120,7 +123,7 @@ Use SQL syntax to query the sample `JSON` and `Parquet` files in the `sample-dat
 A sample JSON file, `employee.json`, contains fictitious employee data.
 
 To view the data in the `employee.json` file, submit the following SQL query
-to Drill:
+to Drill, using the [cp (classpath) storage plugin]({{site.baseurl}}/docs/storage-plugin-registration/) to point to the file.
     
     0: jdbc:drill:zk=local> SELECT * FROM cp.`employee.json` LIMIT 3;
 
@@ -146,20 +149,12 @@ If you followed the Apache Drill in 10 Minutes instructions to install Drill
 in embedded mode, the path to the parquet file varies between operating
 systems.
 
-{% include startnote.html %}When you enter the query, include the version of Drill that you are currently running.{% include endnote.html %} 
+{% include startnote.html %}Substitute your installation path and the Drill version in the angle-bracketed locations when you enter the query.{% include endnote.html %} 
 
 To view the data in the `region.parquet` file, issue the query appropriate for
 your operating system:
 
-* Linux  
-
-        SELECT * FROM dfs.`/opt/drill/apache-drill-<version>/sample-data/region.parquet`;
-* Mac OS X
-  
-        SELECT * FROM dfs.`/Users/max/drill/apache-drill-<version>/sample-data/region.parquet`;
-* Windows  
-        
-        SELECT * FROM dfs.`C:\drill\apache-drill-<version>\sample-data\region.parquet`;
+        SELECT * FROM dfs.`<path-to-installation>/apache-drill-<version>/sample-data/region.parquet`;
 
 The query returns the following results:
 
@@ -180,21 +175,12 @@ If you followed the Apache Drill in 10 Minutes instructions to install Drill
 in embedded mode, the path to the parquet file varies between operating
 systems.
 
-{% include startnote.html %}When you enter the query, include the version of Drill that you are currently running.{% include endnote.html %}
+{% include startnote.html %}Substitute your installation path and the Drill version in the angle-bracketed locations when you enter the query{% include endnote.html %}
 
 To view the data in the `nation.parquet` file, issue the query appropriate for
 your operating system:
 
-* Linux  
-
-          SELECT * FROM dfs.`/opt/drill/apache-drill-<version>/sample-data/nation.parquet`;
-* Mac OS X
-  
-          SELECT * FROM dfs.`/Users/max/drill/apache-drill-<version>/sample-data/nation.parquet`;
-
-* Windows 
- 
-          SELECT * FROM dfs.`C:\drill\apache-drill-<version>\sample-data\nation.parquet`;
+          SELECT * FROM dfs.`<path-to-installation>/apache-drill-<version>/sample-data/nation.parquet`;
 
 The query returns the following results:
 

http://git-wip-us.apache.org/repos/asf/drill/blob/72b6615b/_docs/tutorials/030-analyzing-the-yelp-academic-dataset.md
----------------------------------------------------------------------
diff --git a/_docs/tutorials/030-analyzing-the-yelp-academic-dataset.md b/_docs/tutorials/030-analyzing-the-yelp-academic-dataset.md
index 1eb2728..c16964b 100644
--- a/_docs/tutorials/030-analyzing-the-yelp-academic-dataset.md
+++ b/_docs/tutorials/030-analyzing-the-yelp-academic-dataset.md
@@ -5,9 +5,9 @@ parent: "Tutorials"
 Apache Drill is one of the fastest growing open source projects, with the community making rapid progress with monthly releases. The key difference is Drill’s agility and flexibility.
 Along with meeting the table stakes for SQL-on-Hadoop, which is to achieve low
 latency performance at scale, Drill allows users to analyze the data without
-any ETL or up-front schema definitions. The data could be in any file format
-such as text, JSON, or Parquet. Data could have simple types such as string,
-integer, dates, or more complex multi-structured data, such as nested maps and
+any ETL or up-front schema definitions. The data can be in any file format
+such as text, JSON, or Parquet. Data can have simple types such as strings,
+integers, dates, or more complex multi-structured data, such as nested maps and
 arrays. Data can exist in any file system, local or distributed, such as HDFS,
 MapR FS, or S3. Drill, has a “no schema” approach, which enables you to get
 value from your data in just a few minutes.
@@ -23,25 +23,15 @@ example is downloadable from [Yelp](http://www.yelp.com/dataset_challenge)
 
 ### Step 1: Download Apache Drill onto your local machine
 
-[http://drill.apache.org/download/](http://drill.apache.org/download/)
+To experiment with Drill locally, follow the installation instructions in [Drill in 10 Minutes]({{site.baseurl}}/docs/drill-in-10-minutes/).
 
-You can also [in Drill in distributed mode]({{ site.baseurl }}/docs/installing-drill-in-distributed-mode) if you
+Alternatively, you can [install Drill in distributed mode]({{ site.baseurl }}/docs/installing-drill-in-distributed-mode) if you
 want to scale your environment.
 
-### Step 2 : Open the Drill tar file
-
-    tar -xvf apache-drill-0.1.0.tar.gz
-
-### Step 3: Start the Drill shell.
-
-    bin/drill-embedded
-
-That’s it! You are now ready explore the data.
-
 Let’s try out some SQL examples to understand how Drill makes the raw data
 analysis extremely easy.
 
-{% include startnote.html %}You need to substitute your local path to the Yelp data set in the FROM clause of each query you run.{% include endnote.html %}
+{% include startnote.html %}You need to substitute your local path to the Yelp data set in the angle-bracketed portion of the FROM clause of each query you run.{% include endnote.html %}
 
 ----------
 
@@ -52,7 +42,7 @@ analysis extremely easy.
     0: jdbc:drill:zk=local> !set maxwidth 10000
 
     0: jdbc:drill:zk=local> select * from
-        dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json`
+        dfs.`<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json`
         limit 1;
 
     +------------------------+----------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------+--------------------------------+---------+--------------+-------------------+-------------+-------+-------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+----------+---------------+
@@ -70,7 +60,7 @@ You can directly query self-describing files such as JSON, Parquet, and text. Th
 #### Total reviews in the data set
 
     0: jdbc:drill:zk=local> select sum(review_count) as totalreviews 
-    from dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json`;
+    from dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json`;
 
     +--------------+
     | totalreviews |
@@ -81,7 +71,7 @@ You can directly query self-describing files such as JSON, Parquet, and text. Th
 #### Top states and cities in total number of reviews
 
     0: jdbc:drill:zk=local> select state, city, count(*) totalreviews 
-    from dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json` 
+    from dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json` 
     group by state, city order by count(*) desc limit 10;
 
     +------------+------------+--------------+
@@ -102,7 +92,7 @@ You can directly query self-describing files such as JSON, Parquet, and text. Th
 #### Average number of reviews per business star rating
 
     0: jdbc:drill:zk=local> select stars,trunc(avg(review_count)) reviewsavg 
-    from dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json`
+    from dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json`
     group by stars order by stars desc;
 
     +------------+------------+
@@ -122,7 +112,7 @@ You can directly query self-describing files such as JSON, Parquet, and text. Th
 #### Top businesses with high review counts (> 1000)
 
     0: jdbc:drill:zk=local> select name, state, city, `review_count` from
-    dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json`
+    dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json`
     where review_count > 1000 order by `review_count` desc limit 10;
 
     +-------------------------------+-------------+------------+---------------+
@@ -145,7 +135,7 @@ You can directly query self-describing files such as JSON, Parquet, and text. Th
     0: jdbc:drill:zk=local> select b.name, b.hours.Saturday.`open`,
     b.hours.Saturday.`close`  
     from
-    dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json`
+    dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json`
     b limit 10;
 
     +----------------------------+------------+------------+
@@ -184,7 +174,7 @@ the data).
 
 Then, query the attribute’s data.
 
-    0: jdbc:drill:zk=local> select attributes from dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json` limit 10;
+    0: jdbc:drill:zk=local> select attributes from dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json` limit 10;
 
     +-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
     |                                                     attributes                                                                                                                    |
@@ -217,7 +207,7 @@ on data.
 
 #### Number of restaurants in the data set
 
-    0: jdbc:drill:zk=local> select count(*) as TotalRestaurants from dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json` where true=repeated_contains(categories,'Restaurants');
+    0: jdbc:drill:zk=local> select count(*) as TotalRestaurants from dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json` where true=repeated_contains(categories,'Restaurants');
     +------------------+
     | TotalRestaurants |
     +------------------+
@@ -226,7 +216,7 @@ on data.
 
 #### Top restaurants in number of reviews
 
-    0: jdbc:drill:zk=local> select name,state,city,`review_count` from dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json` where true=repeated_contains(categories,'Restaurants') order by `review_count` desc limit 10;
+    0: jdbc:drill:zk=local> select name,state,city,`review_count` from dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json` where true=repeated_contains(categories,'Restaurants') order by `review_count` desc limit 10;
 
     +------------------------+-------+-----------+--------------+
     |          name          | state |    city   | review_count |
@@ -245,7 +235,7 @@ on data.
 
 #### Top restaurants in number of listed categories
 
-    0: jdbc:drill:zk=local> select name,repeated_count(categories) as categorycount, categories from dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json` where true=repeated_contains(categories,'Restaurants') order by repeated_count(categories) desc limit 10;
+    0: jdbc:drill:zk=local> select name,repeated_count(categories) as categorycount, categories from dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json` where true=repeated_contains(categories,'Restaurants') order by repeated_count(categories) desc limit 10;
 
     +---------------------------------+---------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
     | name                            | categorycount | categories                                                                                                                                        |
@@ -267,7 +257,7 @@ on data.
 #### Top first categories in number of review counts
 
     0: jdbc:drill:zk=local> select categories[0], count(categories[0]) as categorycount 
-    from dfs.`/users/nrentachintala/Downloads/yelp_academic_dataset_business.json` 
+    from dfs.`/<path-to-yelp-dataset>/yelp_academic_dataset_business.json` 
     group by categories[0] 
     order by count(categories[0]) desc limit 10;
 
@@ -291,7 +281,7 @@ on data.
 #### Take a look at the contents of the Yelp reviews dataset.
 
     0: jdbc:drill:zk=local> select * 
-    from dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_review.json` limit 1;
+    from dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_review.json` limit 1;
     +---------------------------------+------------------------+------------------------+-------+------------+----------------------------------------------------------------------+--------+------------------------+
     | votes                           | user_id                | review_id              | stars | date       | text                                                                 | type   | business_id            |
     +---------------------------------+------------------------+------------------------+-------+------------+----------------------------------------------------------------------+--------+------------------------+
@@ -305,9 +295,9 @@ review_count to the Yelp review data, which holds additional details on each
 of the reviews themselves.
 
     0: jdbc:drill:zk=local> Select b.name 
-    from dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json` b 
+    from dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json` b 
     where b.business_id in (SELECT r.business_id 
-    FROM dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_review.json` r
+    FROM dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_review.json` r
     GROUP BY r.business_id having sum(r.votes.cool) > 2000 
     order by sum(r.votes.cool)  desc);
     +-------------------------------+
@@ -329,7 +319,7 @@ instead of in a logical view, you can use CREATE TABLE AS SELECT syntax.
 
     0: jdbc:drill:zk=local> create or replace view dfs.tmp.businessreviews as 
     Select b.name,b.stars,b.state,b.city,r.votes.funny,r.votes.useful,r.votes.cool, r.`date` 
-    from dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json` b, dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_review.json` r 
+    from dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json` b, dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_review.json` r 
     where r.business_id=b.business_id
     +------------+-----------------------------------------------------------------+
     |     ok     |                           summary                               |
@@ -346,7 +336,7 @@ Let’s get the total number of records from the view.
     | 1125458    |
     +------------+
 
-In addition to these queries, you can get many more deeper insights using
+In addition to these queries, you can get many deep insights using
 Drill’s [SQL functionality]({{ site.baseurl }}/docs/sql-reference). If you are not comfortable with writing queries manually, you
 can use a BI/Analytics tools such as Tableau/MicroStrategy to query raw
 files/Hive/HBase data or Drill-created views directly using Drill [ODBC/JDBC
@@ -363,7 +353,7 @@ data so you can apply even deeper SQL functionality. Here is a sample query:
 #### Get a flattened list of categories for each business
 
     0: jdbc:drill:zk=local> select name, flatten(categories) as category 
-    from dfs.`/users/nrentachintala/Downloads/yelp/yelp_academic_dataset_business.json`  limit 20;
+    from dfs.`/<path-to-yelp-dataset>/yelp/yelp_academic_dataset_business.json`  limit 20;
     +-----------------------------+---------------------------------+
     | name                        | category                        |
     +-----------------------------+---------------------------------+


[05/12] drill git commit: Jason's 030-developing-an-aggregate-function.md pull request

Posted by ts...@apache.org.
Jason's 030-developing-an-aggregate-function.md pull request


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/5c428161
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/5c428161
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/5c428161

Branch: refs/heads/gh-pages
Commit: 5c4281613f37afd5bfcaf29a689ab351c4fcd924
Parents: 0a7f82b
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu May 21 17:48:35 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu May 21 17:48:35 2015 -0700

----------------------------------------------------------------------
 .../030-developing-an-aggregate-function.md     | 21 +-------------------
 1 file changed, 1 insertion(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/5c428161/_docs/develop-custom-functions/030-developing-an-aggregate-function.md
----------------------------------------------------------------------
diff --git a/_docs/develop-custom-functions/030-developing-an-aggregate-function.md b/_docs/develop-custom-functions/030-developing-an-aggregate-function.md
index 50bc462..76a9cfe 100644
--- a/_docs/develop-custom-functions/030-developing-an-aggregate-function.md
+++ b/_docs/develop-custom-functions/030-developing-an-aggregate-function.md
@@ -29,26 +29,7 @@ Complete the following steps to create an aggregate function:
 		@Param BitHolder in;
 		@Workspace BitHolder value;
 		@Output BitHolder out;
-  4. Include the `setup(), add(), output(),` and `reset()` methods.
-	
-	**Example**
-		public void setup() {
-		  value = new BitHolder(); 
-		  value.value = 0;
-		}
-		 
-		@Override
-		public void add() {
-		  value.value++;
-		}
-		@Override
-		public void output() {
-		  out.value = value.value;
-		}
-		@Override
-		public void reset() {
-		 
-		  value.value = 0;
+  4. Include the `setup(), add(), output(),` and `reset()` methods.  
   5. Use the maven-source-plugin to compile the sources and classes JAR files. Verify that an empty `drill-module.conf` is included in the resources folder of the JARs.   
 Drill searches this module during classpath scanning. If the file is not
 included in the resources folder, you can add it to the JAR file or add it to


[03/12] drill git commit: hsuanyi's Update 020-develop-a-simple-function.md pull request

Posted by ts...@apache.org.
hsuanyi's Update 020-develop-a-simple-function.md pull request


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/3a32564b
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/3a32564b
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/3a32564b

Branch: refs/heads/gh-pages
Commit: 3a32564b1730dc47ef657e20c82a38d25f4ce83a
Parents: b99a8e0
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu May 21 17:27:56 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu May 21 17:27:56 2015 -0700

----------------------------------------------------------------------
 _docs/develop-custom-functions/020-develop-a-simple-function.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/3a32564b/_docs/develop-custom-functions/020-develop-a-simple-function.md
----------------------------------------------------------------------
diff --git a/_docs/develop-custom-functions/020-develop-a-simple-function.md b/_docs/develop-custom-functions/020-develop-a-simple-function.md
index 094f0c1..794182c 100644
--- a/_docs/develop-custom-functions/020-develop-a-simple-function.md
+++ b/_docs/develop-custom-functions/020-develop-a-simple-function.md
@@ -15,7 +15,7 @@ function interface:
 		<dependency>
 		<groupId>org.apache.drill.exec</groupId>
 		<artifactId>drill-java-exec</artifactId>
-		<version>1.0.0-m2-incubating-SNAPSHOT</version>
+		<version>1.0.0</version>
 		</dependency>
 
   2. Create a class that implements the `DrillSimpleFunc` interface and identify the scope as `FunctionScope.SIMPLE`.
@@ -40,7 +40,7 @@ function interface:
 		public void setup(RecordBatch b) {
 		}
 		public void eval() {
-		 out.value = (int) (in1.value + in2.value);
+		 out.value = in1.value + in2.value;
 		}
 
   5. Use the maven-source-plugin to compile the sources and classes JAR files. Verify that an empty `drill-module.conf` is included in the resources folder of the JARs.   


[11/12] drill git commit: adenache's drill version fix pull request

Posted by ts...@apache.org.
adenache's drill version fix pull request


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/a050899a
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/a050899a
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/a050899a

Branch: refs/heads/gh-pages
Commit: a050899a846613134ca031538062fca9ef8863ea
Parents: 01857c5
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 22 07:10:10 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 22 07:10:10 2015 -0700

----------------------------------------------------------------------
 .../010-connect-a-data-source-introduction.md                    | 3 ++-
 .../040-installing-drill-on-windows.md                           | 4 ++--
 _docs/tutorials/020-drill-in-10-minutes.md                       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/a050899a/_docs/connect-a-data-source/010-connect-a-data-source-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/010-connect-a-data-source-introduction.md b/_docs/connect-a-data-source/010-connect-a-data-source-introduction.md
index db886f2..29133c0 100644
--- a/_docs/connect-a-data-source/010-connect-a-data-source-introduction.md
+++ b/_docs/connect-a-data-source/010-connect-a-data-source-introduction.md
@@ -25,4 +25,5 @@ A storage plugin provides the following information to Drill:
   * Interfaces that Drill can use to read from and write to data sources
   * A set of storage plugin optimization rules that assist with efficient and faster execution of Drill queries, such as pushdowns, statistics, and partition awareness
 
-A storage plugin performs scanner and writer functions and informs the execution engine of any native capabilities.
\ No newline at end of file
+A storage plugin performs scanner and writer functions and informs the execution engine of any native capabilities, such
+as predicate pushdown, joins, and SQL.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/a050899a/_docs/install/installing-drill-in-embedded-mode/040-installing-drill-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/install/installing-drill-in-embedded-mode/040-installing-drill-on-windows.md b/_docs/install/installing-drill-in-embedded-mode/040-installing-drill-on-windows.md
index a8f82fa..93d6ef6 100755
--- a/_docs/install/installing-drill-in-embedded-mode/040-installing-drill-on-windows.md
+++ b/_docs/install/installing-drill-in-embedded-mode/040-installing-drill-on-windows.md
@@ -4,9 +4,9 @@ parent: "Installing Drill in Embedded Mode"
 ---
 You can install Drill on Windows 7 or 8. First, check that you [meet the prerequisites]({{site.baseurl}}/docs/embedded-mode-prerequisites), including setting the JAVA_HOME environment variable, and then install Drill. Complete the following steps to install Drill:
 
-1. Click the following link to download the latest, stable version of Apache Drill:  [http://getdrill.org/drill/download/apache-drill-0.1.0.tar.gz](http://getdrill.org/drill/download/apache-drill-0.9.0.tar.gz)
+1. Click the following link to download the latest, stable version of Apache Drill:  [http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz](http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz)
 2. Move the `apache-drill-1.0.0.tar.gz` file to a directory where you want to install Drill.
-3. Unzip the `TAR.GZ` file using a third-party tool. If the tool you use does not unzip the TAR file as well as the `TAR.GZ` file, unzip the `apache-drill-0.1.0.tar` to extract the Drill software. The extraction process creates the installation directory named apache-drill-0.1.0 containing the Drill software. For example:
+3. Unzip the `TAR.GZ` file using a third-party tool. If the tool you use does not unzip the TAR file as well as the `TAR.GZ` file, unzip the `apache-drill-1.0.0.tar` to extract the Drill software. The extraction process creates the installation directory named apache-drill-1.0.0 containing the Drill software. For example:
    ![drill install dir]({{ site.baseurl }}/docs/img/drill-directory.png)
 
 At this point, you can [start Drill]({{site.baseurl}}/docs/starting-drill-on-windows). 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/a050899a/_docs/tutorials/020-drill-in-10-minutes.md
----------------------------------------------------------------------
diff --git a/_docs/tutorials/020-drill-in-10-minutes.md b/_docs/tutorials/020-drill-in-10-minutes.md
index 4a5a994..6584021 100755
--- a/_docs/tutorials/020-drill-in-10-minutes.md
+++ b/_docs/tutorials/020-drill-in-10-minutes.md
@@ -79,7 +79,7 @@ Start Drill in embedded mode using the `drill-embedded` command:
 
 You can install Drill on Windows 7 or 8. First, set the JAVA_HOME environment variable, and then install Drill. Complete the following steps to install Drill:
 
-1. Click the following link to download the latest version of Apache Drill:  [http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz](http://getdrill.org/drill/download/apache-drill-0.1.0.tar.gz)  
+1. Click the following link to download the latest version of Apache Drill:  [http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz](http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz)  
 2. Move the `apache-drill-1.0.0.tar.gz` file to a directory where you want to install Drill.  
 3. Unzip the `TAR.GZ` file using a third-party tool. If the tool you use does not unzip the TAR file as well as the `TAR.GZ` file, unzip the `apache-drill-1.0.0.tar` to extract the Drill software. The extraction process creates the installation directory named apache-drill-1.0.0 containing the Drill software. For example:  
    ![drill install dir]({{ site.baseurl }}/docs/img/drill-directory.png)


[09/12] drill git commit: Steven's review

Posted by ts...@apache.org.
Steven's review


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/3cbb00cd
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/3cbb00cd
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/3cbb00cd

Branch: refs/heads/gh-pages
Commit: 3cbb00cdecdc4072808a0e45943735483cda029a
Parents: 042d222
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 22 05:42:38 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 22 05:42:38 2015 -0700

----------------------------------------------------------------------
 .../010-connect-a-data-source-introduction.md               | 3 +--
 .../035-plugin-configuration-introduction.md                | 7 +++----
 _docs/connect-a-data-source/100-mapr-db-format.md           | 4 ++--
 _docs/query-data/030-querying-hbase.md                      | 9 +--------
 4 files changed, 7 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/3cbb00cd/_docs/connect-a-data-source/010-connect-a-data-source-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/010-connect-a-data-source-introduction.md b/_docs/connect-a-data-source/010-connect-a-data-source-introduction.md
index 29133c0..db886f2 100644
--- a/_docs/connect-a-data-source/010-connect-a-data-source-introduction.md
+++ b/_docs/connect-a-data-source/010-connect-a-data-source-introduction.md
@@ -25,5 +25,4 @@ A storage plugin provides the following information to Drill:
   * Interfaces that Drill can use to read from and write to data sources
   * A set of storage plugin optimization rules that assist with efficient and faster execution of Drill queries, such as pushdowns, statistics, and partition awareness
 
-A storage plugin performs scanner and writer functions and informs the execution engine of any native capabilities, such
-as predicate pushdown, joins, and SQL.
\ No newline at end of file
+A storage plugin performs scanner and writer functions and informs the execution engine of any native capabilities.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/3cbb00cd/_docs/connect-a-data-source/035-plugin-configuration-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/035-plugin-configuration-introduction.md b/_docs/connect-a-data-source/035-plugin-configuration-introduction.md
index ccc68d9..7c850ae 100644
--- a/_docs/connect-a-data-source/035-plugin-configuration-introduction.md
+++ b/_docs/connect-a-data-source/035-plugin-configuration-introduction.md
@@ -191,10 +191,9 @@ For example, this command creates a plugin named myplugin for reading files of a
 
 ## Bootstrapping a Storage Plugin
 
-Bootstrapping a storage plugin works only when the first drillbit in the cluster first starts up. After startup, you have to use the REST API or Drill Web UI. If you need to add a storage plugin to Drill and do not want to use a web browser, you can create a [bootstrap-storage-plugins.json](https://github.com/apache/drill/blob/master/contrib/storage-hbase/src/main/resources/bootstrap-storage-plugins.json) file and include it on the classpath when starting Drill. The storage plugin loads when Drill starts up.
-
 If you need to add a storage plugin to Drill and do not want to use a web browser, you can create a [bootstrap-storage-plugins.json](https://github.com/apache/drill/blob/master/contrib/storage-hbase/src/main/resources/bootstrap-storage-plugins.json) file and include it on the classpath when starting Drill. The storage plugin loads when Drill starts up.
 
-If you configure an HBase storage plugin using bootstrap-storage-plugins.json file and HBase is not install, you might experience a delay when executing the queries. Configure the [HBase client timeout](http://hbase.apache.org/book.html#config.files) and retry settings in the config block of HBase plugin instance configuration.
+Bootstrapping a storage plugin works only when the first drillbit in the cluster first starts up. After cluster startup, you have to use the REST API or Drill Web UI to add a storage plugin. 
+
 
-If you configure an HBase storage plugin using bootstrap-storage-plugins.json file and HBase is not install, you might experience a delay when executing the queries. Configure the [HBase client timeout](http://hbase.apache.org/book.html#config.files) and retry settings in the config block of HBase plugin instance configuration.
\ No newline at end of file
+If you configure an HBase storage plugin using bootstrap-storage-plugins.json file and HBase is not installed, you might experience a delay when executing the queries. Configure the [HBase client timeout](http://hbase.apache.org/book.html#config.files) and retry settings in the config block of HBase plugin instance configuration.

http://git-wip-us.apache.org/repos/asf/drill/blob/3cbb00cd/_docs/connect-a-data-source/100-mapr-db-format.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/100-mapr-db-format.md b/_docs/connect-a-data-source/100-mapr-db-format.md
index 443ef6a..f101dfa 100644
--- a/_docs/connect-a-data-source/100-mapr-db-format.md
+++ b/_docs/connect-a-data-source/100-mapr-db-format.md
@@ -2,7 +2,7 @@
 title: "MapR-DB Format"
 parent: "Connect a Data Source"
 ---
-Drill includes a `maprdb` format for MapR-DB that is defined within the
+The MapR-DB format is not included in apache drill release. Drill includes a `maprdb` format for MapR-DB that is defined within the
 default `dfs` storage plugin instance when you install Drill from the `mapr-drill` package on a MapR node. The `maprdb` format improves the
 estimated number of rows that Drill uses to plan a query. It also enables you
 to query tables like you would query files in a file system because MapR-DB
@@ -21,7 +21,7 @@ query.
     SELECT * FROM mfs.`/users/max/mytable`;
 
 The following image shows a portion of the configuration with the `maprdb`
-format plugin for the `dfs` instance:
+format for the `dfs` instance:
 
 ![drill query flow]({{ site.baseurl }}/docs/img/18.png)
 

http://git-wip-us.apache.org/repos/asf/drill/blob/3cbb00cd/_docs/query-data/030-querying-hbase.md
----------------------------------------------------------------------
diff --git a/_docs/query-data/030-querying-hbase.md b/_docs/query-data/030-querying-hbase.md
index 7febf42..f24846e 100644
--- a/_docs/query-data/030-querying-hbase.md
+++ b/_docs/query-data/030-querying-hbase.md
@@ -2,9 +2,7 @@
 title: "Querying HBase"
 parent: "Query Data"
 ---
-This exercise creates two tables in HBase, students and clicks, that you can query with Drill. As an HBase user, you most likely are running Drill in distributed mode, in which Drill might start as a service. If you are not an HBase user and just kicking the tires, you might use the Drill Sandbox on a single-node cluster (embedded mode). In this case, you need to [start Drill]({{ site.baseurl }}/docs/install-drill/) before performing step 5 of this exercise. On the Drill Sandbox, HBase tables you create will be located in: `/mapr/demo.mapr.com/tables`
-
-You use the CONVERT_TO and CONVERT_FROM functions to convert binary text to readable output. You use the CAST function to convert the binary INT to readable output in step 4 of [Query HBase Tables]({{site.baseurl}}/docs/querying-hbase/#query-hbase-tables). When converting an INT or BIGINT number, having a byte count in the destination/source that does not match the byte count of the number in the VARBINARY source/destination, use CAST.
+This exercise creates two tables in HBase, students and clicks, that you can query with Drill. You use the CONVERT_TO and CONVERT_FROM functions to convert binary text to readable output. You use the CAST function to convert the binary INT to readable output in step 4 of [Query HBase Tables]({{site.baseurl}}/docs/querying-hbase/#query-hbase-tables). When converting an INT or BIGINT number, having a byte count in the destination/source that does not match the byte count of the number in the VARBINARY source/destination, use CAST.
 
 ## Create the HBase tables
 
@@ -87,11 +85,6 @@ steps:
 4. Issue the following command to put the data into hbase:  
   
         cat testdata.txt | hbase shell
-5. In Drill, use the [MapR-DB format plugin]({{ site.baseurl }}/docs/mapr-db-format), if you are using the Drill Sandbox; otherwise, enable and use the hbase storage plugin on a system having HBase services.  
-   * USE hbase;  /* If you have installed HBase services. */  
-   * USE maprdb;  /* If you are using the Drill Sandbox */
-
-The `maprdb` format plugin provides access to the `/tables` directory. Use Drill to query the students and clicks tables on the Drill Sandbox.  
 
 ## Query HBase Tables
 1. Issue the following query to see the data in the students table:  


[10/12] drill git commit: adeneche's updated output of select * from sys.drillbits pull request

Posted by ts...@apache.org.
adeneche's updated output of select * from sys.drillbits pull request


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/01857c5d
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/01857c5d
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/01857c5d

Branch: refs/heads/gh-pages
Commit: 01857c5db4c666a248ea98b138d92a6c7906ceeb
Parents: 3cbb00c
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 22 07:01:35 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 22 07:01:35 2015 -0700

----------------------------------------------------------------------
 _docs/install/050-starting-drill-in-distributed mode.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/01857c5d/_docs/install/050-starting-drill-in-distributed mode.md
----------------------------------------------------------------------
diff --git a/_docs/install/050-starting-drill-in-distributed mode.md b/_docs/install/050-starting-drill-in-distributed mode.md
index 4a66447..aca25eb 100644
--- a/_docs/install/050-starting-drill-in-distributed mode.md	
+++ b/_docs/install/050-starting-drill-in-distributed mode.md	
@@ -44,11 +44,11 @@ Complete the following steps to start the Drill shell on the local node:
 
 Drill provides a list of Drillbits that are running.
 
-    +----------------+--------------+--------------+--------------------+
-    |    host        | user_port    | control_port |      data_port     |
-    +----------------+--------------+--------------+--------------------+
-    | <host address> | <port number>| <port number>|   <port number>    |
-    +----------------+--------------+--------------+--------------------+
+    +----------------+---------------+---------------+---------------+-----------+
+    |    hostname    | user_port     | control_port  |   data_port   |  current  |
+    +----------------+---------------+---------------+---------------+-----------+
+    | <host address> | <port number> | <port number> | <port number> | <boolean> |
+    +----------------+---------------+---------------+---------------+-----------+
 
 Now you can run queries. The Drill installation includes sample data
 that you can query. Refer to [Querying Parquet Files]({{ site.baseurl }}/docs/querying-parquet-files/).


[07/12] drill git commit: broken link

Posted by ts...@apache.org.
broken link


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/d5a4c18b
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/d5a4c18b
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/d5a4c18b

Branch: refs/heads/gh-pages
Commit: d5a4c18befd14e4934cb41d5df6f47de1d88a8a2
Parents: 72b6615
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu May 21 19:04:36 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu May 21 19:04:36 2015 -0700

----------------------------------------------------------------------
 .../020-installing-drill-on-linux-and-mac-os-x.md             | 7 +++----
 .../030-starting-drill-on-linux-and-mac-os-x.md               | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/d5a4c18b/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md b/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
index 492c218..9ec9c27 100755
--- a/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
+++ b/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
@@ -8,14 +8,13 @@ Complete the following steps to install Drill:
 
 1. In a terminal windows, change to the directory where you want to install Drill.
 
-2. one of the following two commands (some systems will have wget, and some will have curl) to download the latest version of Apache Drill, or download Drill from the [Drill web site](http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz):
-
+2. To download the latest version of Apache Drill, download Drill from the [Drill web site](http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz) or run one of the following commands, depending on which you have installed on your system:  
    * `wget http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz`  
    *  `curl -o apache-drill-1.0.0.tar.gz http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz`  
 
-2. Copy the downloaded file to the directory where you want to install Drill. 
+3. Copy the downloaded file to the directory where you want to install Drill. 
 
-3. Extract the contents of the Drill tar.gz file. Use sudo if necessary:  
+4. Extract the contents of the Drill tar.gz file. Use sudo if necessary:  
 
         sudo tar -xvzf apache-drill-1.0.0.tar.gz  
 

http://git-wip-us.apache.org/repos/asf/drill/blob/d5a4c18b/_docs/install/installing-drill-in-embedded-mode/030-starting-drill-on-linux-and-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/install/installing-drill-in-embedded-mode/030-starting-drill-on-linux-and-mac-os-x.md b/_docs/install/installing-drill-in-embedded-mode/030-starting-drill-on-linux-and-mac-os-x.md
index 697f425..06883c1 100644
--- a/_docs/install/installing-drill-in-embedded-mode/030-starting-drill-on-linux-and-mac-os-x.md
+++ b/_docs/install/installing-drill-in-embedded-mode/030-starting-drill-on-linux-and-mac-os-x.md
@@ -16,7 +16,7 @@ Start the Drill shell using the `drill-embedded` command. The command uses a jdb
 
    At this point, you can [run queries]({{site.baseurl}}/docs/query-data).
 
-You can also use the **sqlline** command to start Drill using a custom connection string, as described in ["Using an Ad-Hoc Connection to Drill"](docs/starting-drill-in-distributed-mode/#using-an-ad-hoc-connection-to-drill). For example, you can specify the storage plugin when you start the shell. Doing so eliminates the need to specify the storage plugin in the query: For example, this command specifies the `dfs` storage plugin.
+You can also use the **sqlline** command to start Drill using a custom connection string, as described in ["Using an Ad-Hoc Connection to Drill"]({{site.baseurl}}/docs/starting-drill-in-distributed-mode/#using-an-ad-hoc-connection-to-drill). For example, you can specify the storage plugin when you start the shell. Doing so eliminates the need to specify the storage plugin in the query: For example, this command specifies the `dfs` storage plugin.
 
     bin/sqlline –u jdbc:drill:schema=dfs;zk=local
 


[04/12] drill git commit: Update 030-developing-an-aggregate-function.md pull request

Posted by ts...@apache.org.
Update 030-developing-an-aggregate-function.md pull request


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/0a7f82b7
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/0a7f82b7
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/0a7f82b7

Branch: refs/heads/gh-pages
Commit: 0a7f82b7be63c4539ae1bda00ab8e96e758aa45b
Parents: 3a32564
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu May 21 17:38:43 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu May 21 17:38:43 2015 -0700

----------------------------------------------------------------------
 .../030-developing-an-aggregate-function.md               | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/0a7f82b7/_docs/develop-custom-functions/030-developing-an-aggregate-function.md
----------------------------------------------------------------------
diff --git a/_docs/develop-custom-functions/030-developing-an-aggregate-function.md b/_docs/develop-custom-functions/030-developing-an-aggregate-function.md
index 3368c24..50bc462 100644
--- a/_docs/develop-custom-functions/030-developing-an-aggregate-function.md
+++ b/_docs/develop-custom-functions/030-developing-an-aggregate-function.md
@@ -14,7 +14,7 @@ Complete the following steps to create an aggregate function:
 		<dependency>
 		<groupId>org.apache.drill.exec</groupId>
 		<artifactId>drill-java-exec</artifactId>
-		<version>1.0.0-m2-incubating-SNAPSHOT</version>
+		<version>1.0.0</version>
 		</dependency>
   2. Create a class that implements the `DrillAggFunc` interface and identify the scope as `FunctionTemplate.FunctionScope.POINT_AGGREGATE`.
 
@@ -32,14 +32,14 @@ Complete the following steps to create an aggregate function:
   4. Include the `setup(), add(), output(),` and `reset()` methods.
 	
 	**Example**
-		public void setup(RecordBatch b) {
+		public void setup() {
 		  value = new BitHolder(); 
-		    value.value = 0;
+		  value.value = 0;
 		}
 		 
 		@Override
 		public void add() {
-		      value.value++;
+		  value.value++;
 		}
 		@Override
 		public void output() {
@@ -48,7 +48,7 @@ Complete the following steps to create an aggregate function:
 		@Override
 		public void reset() {
 		 
-		    value.value = 0;
+		  value.value = 0;
   5. Use the maven-source-plugin to compile the sources and classes JAR files. Verify that an empty `drill-module.conf` is included in the resources folder of the JARs.   
 Drill searches this module during classpath scanning. If the file is not
 included in the resources folder, you can add it to the JAR file or add it to


[02/12] drill git commit: JinFengni's Update 020-core-modules.md pull request

Posted by ts...@apache.org.
JinFengni's Update 020-core-modules.md pull request


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/b99a8e08
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/b99a8e08
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/b99a8e08

Branch: refs/heads/gh-pages
Commit: b99a8e082d2b86c9359e50c3782f305d32bc42f0
Parents: 45116b0
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu May 21 17:22:18 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu May 21 17:22:18 2015 -0700

----------------------------------------------------------------------
 _docs/architecture/020-core-modules.md | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/b99a8e08/_docs/architecture/020-core-modules.md
----------------------------------------------------------------------
diff --git a/_docs/architecture/020-core-modules.md b/_docs/architecture/020-core-modules.md
index ac4a415..9575400 100644
--- a/_docs/architecture/020-core-modules.md
+++ b/_docs/architecture/020-core-modules.md
@@ -26,4 +26,3 @@ through Hive if they have metadata defined there. Drill integration with Hive
 is only for metadata. Drill does not invoke the Hive execution engine for any
 requests.
 
-  * **Distributed cache**: Drill uses a distributed cache to manage metadata (not the data) and configuration information across various nodes. Sample metadata information that is stored in the cache includes query plan fragments, intermediate state of the query execution, and statistics. Drill uses Infinispan as its cache technology.
\ No newline at end of file


[12/12] drill git commit: Merge branch 'gh-pages' of https://git-wip-us.apache.org/repos/asf/drill into gh-pages

Posted by ts...@apache.org.
Merge branch 'gh-pages' of https://git-wip-us.apache.org/repos/asf/drill into gh-pages


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/45c29be7
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/45c29be7
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/45c29be7

Branch: refs/heads/gh-pages
Commit: 45c29be75a366cffef50bad2d3d4293915581f83
Parents: a050899 5808b09
Author: Tomer Shiran <ts...@gmail.com>
Authored: Fri May 22 11:30:29 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Fri May 22 11:30:29 2015 -0700

----------------------------------------------------------------------
 _docs/architecture/015-drill-query-execution.md     | 10 +++++-----
 .../070-configuring-user-impersonation.md           | 16 ++++++++--------
 .../075-configuring-user-authentication.md          | 13 +++++++------
 _docs/log-and-debug/002-error-messages.md           |  8 ++++----
 _docs/performance-tuning/020-partition-pruning.md   |  5 +++--
 .../020-physical-operators.md                       |  6 +++---
 6 files changed, 30 insertions(+), 28 deletions(-)
----------------------------------------------------------------------



[08/12] drill git commit: remove sudo from install example

Posted by ts...@apache.org.
remove sudo from install example


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/042d2227
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/042d2227
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/042d2227

Branch: refs/heads/gh-pages
Commit: 042d2227710982180175ff01fd2b3b082fd04f08
Parents: d5a4c18
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 22 05:09:22 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 22 05:09:22 2015 -0700

----------------------------------------------------------------------
 .../020-installing-drill-on-linux-and-mac-os-x.md                | 4 ++--
 _docs/tutorials/020-drill-in-10-minutes.md                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/042d2227/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md b/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
index 9ec9c27..065bee2 100755
--- a/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
+++ b/_docs/install/installing-drill-in-embedded-mode/020-installing-drill-on-linux-and-mac-os-x.md
@@ -14,9 +14,9 @@ Complete the following steps to install Drill:
 
 3. Copy the downloaded file to the directory where you want to install Drill. 
 
-4. Extract the contents of the Drill tar.gz file. Use sudo if necessary:  
+4. Extract the contents of the Drill tar.gz file. Use sudo only if necessary:  
 
-        sudo tar -xvzf apache-drill-1.0.0.tar.gz  
+        tar -xvzf apache-drill-1.0.0.tar.gz  
 
 The extraction process creates the installation directory named apache-drill-1.0.0 containing the Drill software.
 

http://git-wip-us.apache.org/repos/asf/drill/blob/042d2227/_docs/tutorials/020-drill-in-10-minutes.md
----------------------------------------------------------------------
diff --git a/_docs/tutorials/020-drill-in-10-minutes.md b/_docs/tutorials/020-drill-in-10-minutes.md
index 4ce8848..4a5a994 100755
--- a/_docs/tutorials/020-drill-in-10-minutes.md
+++ b/_docs/tutorials/020-drill-in-10-minutes.md
@@ -52,9 +52,9 @@ Complete the following steps to install Drill:
 
 3. Copy the downloaded file to the directory where you want to install Drill. 
 
-4. Extract the contents of the Drill tar.gz file. Use sudo if necessary:  
+4. Extract the contents of the Drill tar.gz file. Use sudo only if necessary:  
 
-        sudo tar -xvzf apache-drill-1.0.0.tar.gz  
+        tar -xvzf apache-drill-1.0.0.tar.gz  
 
 The extraction process creates the installation directory named apache-drill-1.0.0 containing the Drill software.