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/01 20:07:57 UTC

[01/50] [abbrv] drill git commit: DRILL-2854

Repository: drill
Updated Branches:
  refs/heads/gh-pages 8887d8a32 -> 6ed707ba1


DRILL-2854


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

Branch: refs/heads/gh-pages
Commit: e3856b4c89ae33ff20c0e6c97bd5a3e0ac2a2bc1
Parents: b92fcc6
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Apr 29 14:00:26 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Apr 29 14:00:26 2015 -0700

----------------------------------------------------------------------
 .../nested-data-functions/020-kvgen.md           | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/e3856b4c/_docs/sql-reference/nested-data-functions/020-kvgen.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/nested-data-functions/020-kvgen.md b/_docs/sql-reference/nested-data-functions/020-kvgen.md
index 249d211..1e01b16 100644
--- a/_docs/sql-reference/nested-data-functions/020-kvgen.md
+++ b/_docs/sql-reference/nested-data-functions/020-kvgen.md
@@ -76,16 +76,21 @@ keys or constrain the keys in some way. For example, you can use the
 [FLATTEN]({{ site.baseurl }}/docs/flatten-function) function to break the
 array down into multiple distinct rows and further query those rows.
 
-For example, assume that a JSON file contains this data:  
+For example, assume that a JSON file named `simplemaps.json` contains this data:  
 
-    {"a": "valA", "b": "valB"}
-    {"c": "valC", "d": "valD"}
-  
+	{"rec1":{"a": "valA", "b": "valB"}}
+	{"rec1":{"c": "valC", "d": "valD"}}
 
-KVGEN would operate on this data to generate:
+KVGEN would operate on this data as follows:
 
-    [{"key": "a", "value": "valA"}, {"key": "b", "value": "valB"}]
-    [{"key": "c", "value": "valC"}, {"key": "d", "value": "valD"}]
+	SELECT KVGEN(rec1) FROM `simplemaps.json`;
+	+------------+
+	|   EXPR$0   |
+	+------------+
+	| [{"key":"a","value":"valA"},{"key":"b","value":"valB"}] |
+	| [{"key":"c","value":"valC"},{"key":"d","value":"valD"}] |
+	+------------+
+	2 rows selected (0.201 seconds)
 
 Applying the [FLATTEN]({{ site.baseurl }}/docs/flatten-function) function to
 this data would return:


[30/50] [abbrv] drill git commit: Merge branch 'dk-gh-pages-4_27_2015' of https://github.com/testapachedrill/drill into gh-pages

Posted by ts...@apache.org.
Merge branch 'dk-gh-pages-4_27_2015' of https://github.com/testapachedrill/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/d0d76933
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/d0d76933
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/d0d76933

Branch: refs/heads/gh-pages
Commit: d0d76933e4bf92aae578a90637989b2cd86c3f5d
Parents: 858d5a6 d14f5a8
Author: Tomer Shiran <ts...@gmail.com>
Authored: Thu Apr 30 10:15:16 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Thu Apr 30 10:15:16 2015 -0700

----------------------------------------------------------------------
 _layouts/docpage.html |  15 ++++---
 css/breadcrumbs.css   |   4 +-
 css/docpage.css       |  18 +++++---
 css/responsive.css    | 108 ++++++++++++++++++++++++++++++++++++++++++---
 css/style.css         |  38 ++++++++++++----
 docs.html             |   8 +++-
 index.html            |  48 +++++++++++---------
 js/drill.js           |  22 ++++-----
 8 files changed, 203 insertions(+), 58 deletions(-)
----------------------------------------------------------------------



[19/50] [abbrv] drill git commit: Merge branch 'dk-gh-pages-4_27_2015' of https://github.com/testapachedrill/drill into gh-pages

Posted by ts...@apache.org.
Merge branch 'dk-gh-pages-4_27_2015' of https://github.com/testapachedrill/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/858d5a6a
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/858d5a6a
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/858d5a6a

Branch: refs/heads/gh-pages
Commit: 858d5a6a448aef7423c10d422276ed83979d6e78
Parents: 1aaf400 b64cd54
Author: Tomer Shiran <ts...@gmail.com>
Authored: Wed Apr 29 19:56:24 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Wed Apr 29 19:56:24 2015 -0700

----------------------------------------------------------------------
 _includes/doctoc.html           |   4 +-
 _includes/doctoccategories.html |   3 -
 _includes/head.html             |   1 +
 _includes/menu.html             |   5 +-
 _layouts/docpage.html           |  69 +++++++++-------
 css/breadcrumbs.css             |   1 -
 css/docpage.css                 | 149 +++++++++++++++++++----------------
 css/responsive.css              |  38 ++++++---
 css/style.css                   |  21 +++--
 docs.html                       |  26 +-----
 js/drill.js                     |  30 +++----
 11 files changed, 177 insertions(+), 170 deletions(-)
----------------------------------------------------------------------



[24/50] [abbrv] drill git commit: Merge branch 'gh-pages' of https://github.com/tshiran/drill into gh-pages

Posted by ts...@apache.org.
Merge branch 'gh-pages' of https://github.com/tshiran/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/df45a676
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/df45a676
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/df45a676

Branch: refs/heads/gh-pages
Commit: df45a676c56d4d185566ff71e420fd102ecf313b
Parents: 26aa96b 1aaf400
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 08:18:50 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 08:18:50 2015 -0700

----------------------------------------------------------------------
 .gitignore                                      |  1 -
 _layouts.old/default.html                       | 15 -------
 _layouts.old/docpage.html                       | 25 -----------
 _layouts.old/page.html                          |  9 ----
 _layouts.old/post.html                          | 45 --------------------
 blog/_drafts/drill-0.9-released.md              | 32 ++++++++++++++
 ...-parquet-graudates-to-a-top-level-project.md | 17 ++++++++
 7 files changed, 49 insertions(+), 95 deletions(-)
----------------------------------------------------------------------



[28/50] [abbrv] drill git commit: clarify NUMERIC data type

Posted by ts...@apache.org.
clarify NUMERIC data type


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

Branch: refs/heads/gh-pages
Commit: ca09bb37b0ef1dd1cc5837b1cdeacc1a3ee37af1
Parents: 456ee13
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 09:29:46 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 09:29:46 2015 -0700

----------------------------------------------------------------------
 _docs/sql-reference/data-types/010-supported-data-types.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/ca09bb37/_docs/sql-reference/data-types/010-supported-data-types.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/data-types/010-supported-data-types.md b/_docs/sql-reference/data-types/010-supported-data-types.md
index a628925..a789426 100644
--- a/_docs/sql-reference/data-types/010-supported-data-types.md
+++ b/_docs/sql-reference/data-types/010-supported-data-types.md
@@ -31,7 +31,7 @@ Drill reads from and writes to data sources having a wide variety of types. Dril
     <td valign="top">2015-12-30</td>
   </tr>
   <tr>
-    <td valign="top">DECIMAL(p,s), or DEC(p,s), NUMERIC(p,s)</td>
+    <td valign="top">DECIMAL(p,s), or DEC(p,s), NUMERIC(p,s)***</td>
     <td valign="top">38-digit precision number, precision is p, and scale is s</td>
     <td valign="top">DECIMAL(6,2) is 1234.56,  4 digits before and 2 digits after the decimal point</td>
   </tr>
@@ -82,7 +82,8 @@ Drill reads from and writes to data sources having a wide variety of types. Dril
   </tr>
 </table>
 \* Not currently supported.  
-\*\* Currently, Drill supports only variable-length strings. 
+\*\* Currently, Drill supports only variable-length strings. .
+\*\*\* In this release the NUMERIC data type is an alias for the DECIMAL data type.
 +  
 
 ## Casting and Converting Data Types


[33/50] [abbrv] drill git commit: rewrite intro

Posted by ts...@apache.org.
rewrite intro


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

Branch: refs/heads/gh-pages
Commit: ffbf1d38e3f528603b01a25452c7b6e5bc76a175
Parents: bf05a8e
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 10:44:12 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 10:44:12 2015 -0700

----------------------------------------------------------------------
 _docs/manage-drill/010-manage-drill-introduction.md | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/ffbf1d38/_docs/manage-drill/010-manage-drill-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/010-manage-drill-introduction.md b/_docs/manage-drill/010-manage-drill-introduction.md
index b65743c..f3d4e04 100644
--- a/_docs/manage-drill/010-manage-drill-introduction.md
+++ b/_docs/manage-drill/010-manage-drill-introduction.md
@@ -2,11 +2,6 @@
 title: "Manage Drill Introduction"
 parent: "Manage Drill"
 ---
-When using Drill, you may need to stop and restart a Drillbit on a node, or
-modify various options. For example, the default storage format for CTAS
+When using Drill, you need to configure memory to make sufficient memory available for your application. The more memory for Drill, the better. You may need to modify options for performance or functionality. For example, the default storage format for CTAS
 statements is Parquet. You can modify the default setting so that output data
-is stored in CSV or JSON format.
-
-You can use certain SQL commands to manage Drill from within the Drill shell
-(SQLLine). You can also modify Drill configuration options, such as memory
-allocation, in Drill's configuration files.
+is stored in CSV or JSON format. The many options you can configure are covered in this section. This section also includes stopping and restarting a Drillbit on a node, ports used by Drill, and partition pruning.


[47/50] [abbrv] drill git commit: minor edit

Posted by ts...@apache.org.
minor edit


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

Branch: refs/heads/gh-pages
Commit: c010ca88836f2b81ab64c7ac589876e943cf5783
Parents: df9bd61
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 09:59:06 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 09:59:06 2015 -0700

----------------------------------------------------------------------
 .../013-configuring-dfferent-workloads-introduction.md             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/c010ca88/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
index 9558039..fe87179 100644
--- a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
+++ b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
@@ -19,4 +19,4 @@ You need to plan and configure these resources for use with Drill and other work
 * [CPU]({{site.baseurl}}/docs/configuring-drill-in-a-cluster#how-to-manage-drill-cpu-resources)  
 * Disk  
 
-Configure, memory, queues, and parallelization ["when users share a Drillbit"]({{site.baseurl}}/docs/configuring-resources-for-a-shared-drillbit) covers configuration for Drillbits running on different nodes in the cluster.
\ No newline at end of file
+Configure, memory, queues, and parallelization ["when users share a Drillbit"]({{site.baseurl}}/docs/configuring-resources-for-a-shared-drillbit).
\ No newline at end of file


[13/50] [abbrv] drill git commit: minor edit

Posted by ts...@apache.org.
minor edit


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

Branch: refs/heads/gh-pages
Commit: 4b6f3dd699bf6f371799f2d37000ebbbe8c43742
Parents: 4488e89
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Apr 29 16:40:26 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Apr 29 16:40:26 2015 -0700

----------------------------------------------------------------------
 .../using-odbc-on-windows/010-installing-the-driver-on-windows.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/4b6f3dd6/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
index ab4f040..5d4319f 100755
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
@@ -39,7 +39,7 @@ To install the driver, you need Administrator privileges on the computer.
 
 ## The Tableau Data-connection Customization (TDC) File
 
-The MapR Drill ODBC Driver includes a file named `MapRDrillODBC.TDC`. The TDC file file includes customizations that improve ODBC configuration and performance
+The MapR Drill ODBC Driver includes a file named `MapRDrillODBC.TDC`. The TDC file includes customizations that improve ODBC configuration and performance
 when using Tableau.
 
 ### Installing the TDC File


[08/50] [abbrv] drill git commit: minor edit

Posted by ts...@apache.org.
minor edit


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

Branch: refs/heads/gh-pages
Commit: ec19d2e32aa07a0710bb949bddcce8714d956604
Parents: 19b0028
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Apr 29 15:43:05 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Apr 29 15:43:05 2015 -0700

----------------------------------------------------------------------
 _docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/ec19d2e3/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md b/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
index 8fd5b1a..a6e82d6 100644
--- a/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
+++ b/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
@@ -5,7 +5,7 @@ parent: "Connect a Data Source"
 ## Overview
 
 Drill provides a mongodb format plugin to connect to MongoDB, and run queries
-to read, but not to write, the Mongo data ANSI SQL. You do not need any upfront schema definitions.
+to read, but not to write, the Mongo data ANSI SQL. Attempting to write data back to Mongo results in an error. You do not need any upfront schema definitions. 
 
 This procedures in this section assume that you have Drill installed locally (embedded mode),
 as well as MongoDB. Examples in this tutorial use zip code aggregation data


[05/50] [abbrv] drill git commit: missed refactoring and DRILL-994

Posted by ts...@apache.org.
missed refactoring and DRILL-994


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

Branch: refs/heads/gh-pages
Commit: 4826950622a739dbe9e025f808872404aa83949e
Parents: fdf289b
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Apr 29 15:17:33 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Apr 29 15:17:33 2015 -0700

----------------------------------------------------------------------
 _docs/connect-a-data-source/020-plugin-reg.md   |  24 ---
 .../020-storage-plugin-registration.md          |  24 +++
 _docs/connect-a-data-source/030-plugin-conf.md  | 135 ---------------
 .../030-storage-plugin-configuration.md         |   5 +
 ...storage-plugin-configuration-introduction.md | 133 +++++++++++++++
 .../050-file-system-storage-plugin.md           |  64 +++++++
 _docs/connect-a-data-source/050-reg-fs.md       |  64 -------
 .../060-hbase-storage-plugin.md                 |  37 ++++
 _docs/connect-a-data-source/060-reg-hbase.md    |  37 ----
 .../070-hive-storage-plugin.md                  |  77 +++++++++
 _docs/connect-a-data-source/070-reg-hive.md     |  77 ---------
 _docs/connect-a-data-source/080-default-frmt.md |  69 --------
 .../080-drill-default-input-format.md           |  69 ++++++++
 _docs/connect-a-data-source/090-mongo-plugin.md | 169 -------------------
 .../090-mongodb-plugin-for-apache-drill.md      | 169 +++++++++++++++++++
 .../connect-a-data-source/100-mapr-db-format.md |  34 ++++
 .../connect-a-data-source/100-mapr-db-plugin.md |  34 ----
 17 files changed, 612 insertions(+), 609 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/020-plugin-reg.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/020-plugin-reg.md b/_docs/connect-a-data-source/020-plugin-reg.md
deleted file mode 100644
index 1afe31e..0000000
--- a/_docs/connect-a-data-source/020-plugin-reg.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: "Storage Plugin Registration"
-parent: "Connect a Data Source"
----
-You connect Drill to a file system, Hive, HBase, or other data source using storage plugins. Drill includes a number of storage plugins in the installation. On the Storage tab of the Web UI, you can view, create, reconfigure, and register a storage plugin. To open the Storage tab, go to `http://<IP address>:8047/storage`, where IP address is any one of the installed drill bits:
-
-![drill-installed plugins]({{ site.baseurl }}/docs/img/plugin-default.png)
-
-The Drill installation registers the `cp`, `dfs`, `hbase`, `hive`, and `mongo` storage plugins instances by default.
-
-* `cp`
-  Points to a JAR file in the Drill classpath that contains the Transaction Processing Performance Council (TPC) benchmark schema TPC-H that you can query. 
-* `dfs`
-  Points to the local file system on your machine, but you can configure this instance to
-point to any distributed file system, such as a Hadoop or S3 file system. 
-* `hbase`
-   Provides a connection to HBase/M7.
-* `hive`
-   Integrates Drill with the Hive metadata abstraction of files, HBase/M7, and libraries to read data and operate on SerDes and UDFs.
-* `mongo`
-   Provides a connection to MongoDB data.
-
-In the Drill sandbox,  the `dfs` storage plugin connects you to the MapR File System (MFS). Using an installation of Drill instead of the sandbox, `dfs` connects you to the root of your file system.
-

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/020-storage-plugin-registration.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/020-storage-plugin-registration.md b/_docs/connect-a-data-source/020-storage-plugin-registration.md
new file mode 100644
index 0000000..1afe31e
--- /dev/null
+++ b/_docs/connect-a-data-source/020-storage-plugin-registration.md
@@ -0,0 +1,24 @@
+---
+title: "Storage Plugin Registration"
+parent: "Connect a Data Source"
+---
+You connect Drill to a file system, Hive, HBase, or other data source using storage plugins. Drill includes a number of storage plugins in the installation. On the Storage tab of the Web UI, you can view, create, reconfigure, and register a storage plugin. To open the Storage tab, go to `http://<IP address>:8047/storage`, where IP address is any one of the installed drill bits:
+
+![drill-installed plugins]({{ site.baseurl }}/docs/img/plugin-default.png)
+
+The Drill installation registers the `cp`, `dfs`, `hbase`, `hive`, and `mongo` storage plugins instances by default.
+
+* `cp`
+  Points to a JAR file in the Drill classpath that contains the Transaction Processing Performance Council (TPC) benchmark schema TPC-H that you can query. 
+* `dfs`
+  Points to the local file system on your machine, but you can configure this instance to
+point to any distributed file system, such as a Hadoop or S3 file system. 
+* `hbase`
+   Provides a connection to HBase/M7.
+* `hive`
+   Integrates Drill with the Hive metadata abstraction of files, HBase/M7, and libraries to read data and operate on SerDes and UDFs.
+* `mongo`
+   Provides a connection to MongoDB data.
+
+In the Drill sandbox,  the `dfs` storage plugin connects you to the MapR File System (MFS). Using an installation of Drill instead of the sandbox, `dfs` connects you to the root of your file system.
+

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/030-plugin-conf.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/030-plugin-conf.md b/_docs/connect-a-data-source/030-plugin-conf.md
deleted file mode 100644
index 36991ab..0000000
--- a/_docs/connect-a-data-source/030-plugin-conf.md
+++ /dev/null
@@ -1,135 +0,0 @@
----
-title: "Storage Plugin Configuration"
-parent: "Connect a Data Source"
----
-When you add or update storage plugin instances on one Drill node in a Drill
-cluster, Drill broadcasts the information to all of the other Drill nodes 
-to have identical storage plugin configurations. You do not need to
-restart any of the Drillbits when you add or update a storage plugin instance.
-
-Use the Drill Web UI to update or add a new storage plugin. Launch a web browser, go to: `http://<IP address of the sandbox>:8047`, and then go to the Storage tab. 
-
-To create and configure a new storage plugin:
-
-1. Enter a storage name in New Storage Plugin.
-   Each storage plugin registered with Drill must have a distinct
-name. Names are case-sensitive.
-2. Click Create.  
-3. In Configuration, configure attributes of the storage plugin, if applicable, using JSON formatting. The Storage Plugin Attributes table in the next section describes attributes typically reconfigured by users. 
-4. Click Create.
-
-Click Update to reconfigure an existing, enabled storage plugin.
-
-## Storage Plugin Attributes
-The following diagram of the dfs storage plugin briefly describes options you configure in a typical storage plugin configuration:
-
-![dfs plugin]({{ site.baseurl }}/docs/img/connect-plugin.png)
-
-The following table describes the attributes you configure for storage plugins in more detail than the diagram. 
-
-<table>
-  <tr>
-    <th>Attribute</th>
-    <th>Example Values</th>
-    <th>Required</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>"type"</td>
-    <td>"file"<br>"hbase"<br>"hive"<br>"mongo"</td>
-    <td>yes</td>
-    <td>The storage plugin type name supported by Drill.</td>
-  </tr>
-  <tr>
-    <td>"enabled"</td>
-    <td>true<br>false</td>
-    <td>yes</td>
-    <td>The state of the storage plugin.</td>
-  </tr>
-  <tr>
-    <td>"connection"</td>
-    <td>"classpath:///"<br>"file:///"<br>"mongodb://localhost:27017/"<br>"maprfs:///"</td>
-    <td>implementation-dependent</td>
-    <td>The type of distributed file system. Drill can work with any distributed system, such as HDFS and S3, or files in your file system.</td>
-  </tr>
-  <tr>
-    <td>"workspaces"</td>
-    <td>null<br>"logs"</td>
-    <td>no</td>
-    <td>One or more unique workspace names, enclosed in double quotation marks. If a workspace is defined more than once, the latest one overrides the previous ones. Not used with local or distributed file systems.</td>
-  </tr>
-  <tr>
-    <td>"workspaces". . . "location"</td>
-    <td>"location": "/"<br>"location": "/tmp"</td>
-    <td>no</td>
-    <td>The path to a directory on the file system.</td>
-  </tr>
-  <tr>
-    <td>"workspaces". . . "writable"</td>
-    <td>true<br>false</td>
-    <td>no</td>
-    <td>One or more unique workspace names, enclosed in double quotation marks. If a workspace is defined more than once, the latest one overrides the previous ones. Not used with local or distributed file systems.</td>
-  </tr>
-  <tr>
-    <td>"workspaces". . . "defaultInputFormat"</td>
-    <td>null<br>"parquet"<br>"csv"<br>"json"</td>
-    <td>no</td>
-    <td>The format of data Drill reads by default, regardless of extension. Parquet is the default.</td>
-  </tr>
-  <tr>
-    <td>"formats"</td>
-    <td>"psv"<br>"csv"<br>"tsv"<br>"parquet"<br>"json"<br>"maprdb"</td>
-    <td>yes</td>
-    <td>One or more file formats of data Drill can read. Drill can implicitly detect some file formats based on the file extension or the first few bits of data within the file, but you need to configure an option for others.</td>
-  </tr>
-  <tr>
-    <td>"formats" . . . "type"</td>
-    <td>"text"<br>"parquet"<br>"json"<br>"maprdb"</td>
-    <td>yes</td>
-    <td>The type of the format specified. For example, you can define two formats, csv and psv, as type "Text", but having different delimiters. Drill enables the maprdb plugin if you define the maprdb type.</td>
-  </tr>
-  <tr>
-    <td>formats . . . "extensions"</td>
-    <td>["csv"]</td>
-    <td>format-dependent</td>
-    <td>The extensions of the files that Drill can read.</td>
-  </tr>
-  <tr>
-    <td>"formats" . . . "delimiter"</td>
-    <td>"\t"<br>","</td>
-    <td>format-dependent</td>
-    <td>The delimiter used to separate columns in text files such as CSV. Specify a non-printable delimiter in the storage plugin config by using the form \uXXXX, where XXXX is the four numeral hex ascii code for the character.</td>
-  </tr>
-</table>
-
-The configuration of other attributes, such as `size.calculator.enabled` in the hbase plugin and `configProps` in the hive plugin, are implementation-dependent and beyond the scope of this document.
-
-Although Drill can work with different file types in the same directory, restricting a Drill workspace to one file type prevents confusion.
-
-## Case-sensitive Names
-As previously mentioned, workspace and storage plugin names are case-sensitive. For example, the following query uses a storage plugin name `dfs` and a workspace name `clicks`. When you refer to `dfs.clicks` in an SQL statement, use the defined case:
-
-    0: jdbc:drill:> USE dfs.clicks;
-
-For example, using uppercase letters in the query after defining the storage plugin and workspace names using lowercase letters does not work. 
-
-## REST API
-
-Drill provides a REST API that you can use to create a storage plugin. Use an HTTP POST and pass two properties:
-
-* name
-  The plugin name. 
-
-* config
-  The storage plugin definition as you would enter it in the Web UI.
-
-For example, this command creates a plugin named myplugin for reading files of an unknown type located on the root of the file system:
-
-    curl -X POST -/json" -d '{"name":"myplugin", "config": {"type": "file", "enabled": false, "connection": "file:///", "workspaces": { "root": { "location": "/", "writable": false, "defaultInputFormat": null}}, "formats": null}}' http://localhost:8047/storage/myplugin.json
-
-## Bootstrapping a Storage Plugin
-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.
-
-

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/030-storage-plugin-configuration.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/030-storage-plugin-configuration.md b/_docs/connect-a-data-source/030-storage-plugin-configuration.md
new file mode 100644
index 0000000..b75292c
--- /dev/null
+++ b/_docs/connect-a-data-source/030-storage-plugin-configuration.md
@@ -0,0 +1,5 @@
+---
+title: "Storage Plugin Configuration"
+parent: "Connect a Data Source"
+---
+

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md b/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md
new file mode 100644
index 0000000..7a13e3e
--- /dev/null
+++ b/_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md
@@ -0,0 +1,133 @@
+---
+title: "Storage Plugin Configuration Introduction"
+parent: "Storage Plugin Configuration"
+---
+When you add or update storage plugin instances on one Drill node in a Drill
+cluster, Drill broadcasts the information to all of the other Drill nodes 
+to have identical storage plugin configurations. You do not need to
+restart any of the Drillbits when you add or update a storage plugin instance.
+
+Use the Drill Web UI to update or add a new storage plugin. Launch a web browser, go to: `http://<IP address of the sandbox>:8047`, and then go to the Storage tab. 
+
+To create and configure a new storage plugin:
+
+1. Enter a storage name in New Storage Plugin.
+   Each storage plugin registered with Drill must have a distinct
+name. Names are case-sensitive.
+2. Click Create.  
+3. In Configuration, configure attributes of the storage plugin, if applicable, using JSON formatting. The Storage Plugin Attributes table in the next section describes attributes typically reconfigured by users. 
+4. Click Create.
+
+Click Update to reconfigure an existing, enabled storage plugin.
+
+## Storage Plugin Attributes
+The following diagram of the dfs storage plugin briefly describes options you configure in a typical storage plugin configuration:
+
+![dfs plugin]({{ site.baseurl }}/docs/img/connect-plugin.png)
+
+The following table describes the attributes you configure for storage plugins in more detail than the diagram. 
+
+<table>
+  <tr>
+    <th>Attribute</th>
+    <th>Example Values</th>
+    <th>Required</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>"type"</td>
+    <td>"file"<br>"hbase"<br>"hive"<br>"mongo"</td>
+    <td>yes</td>
+    <td>The storage plugin type name supported by Drill.</td>
+  </tr>
+  <tr>
+    <td>"enabled"</td>
+    <td>true<br>false</td>
+    <td>yes</td>
+    <td>The state of the storage plugin.</td>
+  </tr>
+  <tr>
+    <td>"connection"</td>
+    <td>"classpath:///"<br>"file:///"<br>"mongodb://localhost:27017/"<br>"maprfs:///"</td>
+    <td>implementation-dependent</td>
+    <td>The type of distributed file system. Drill can work with any distributed system, such as HDFS and S3, or files in your file system.</td>
+  </tr>
+  <tr>
+    <td>"workspaces"</td>
+    <td>null<br>"logs"</td>
+    <td>no</td>
+    <td>One or more unique workspace names, enclosed in double quotation marks. If a workspace is defined more than once, the latest one overrides the previous ones. Not used with local or distributed file systems.</td>
+  </tr>
+  <tr>
+    <td>"workspaces". . . "location"</td>
+    <td>"location": "/"<br>"location": "/tmp"</td>
+    <td>no</td>
+    <td>The path to a directory on the file system.</td>
+  </tr>
+  <tr>
+    <td>"workspaces". . . "writable"</td>
+    <td>true<br>false</td>
+    <td>no</td>
+    <td>One or more unique workspace names, enclosed in double quotation marks. If a workspace is defined more than once, the latest one overrides the previous ones. Not used with local or distributed file systems.</td>
+  </tr>
+  <tr>
+    <td>"workspaces". . . "defaultInputFormat"</td>
+    <td>null<br>"parquet"<br>"csv"<br>"json"</td>
+    <td>no</td>
+    <td>The format of data Drill reads by default, regardless of extension. Parquet is the default.</td>
+  </tr>
+  <tr>
+    <td>"formats"</td>
+    <td>"psv"<br>"csv"<br>"tsv"<br>"parquet"<br>"json"<br>"maprdb"</td>
+    <td>yes</td>
+    <td>One or more file formats of data Drill can read. Drill can implicitly detect some file formats based on the file extension or the first few bits of data within the file, but you need to configure an option for others.</td>
+  </tr>
+  <tr>
+    <td>"formats" . . . "type"</td>
+    <td>"text"<br>"parquet"<br>"json"<br>"maprdb"</td>
+    <td>yes</td>
+    <td>The type of the format specified. For example, you can define two formats, csv and psv, as type "Text", but having different delimiters. Drill enables the maprdb plugin if you define the maprdb type.</td>
+  </tr>
+  <tr>
+    <td>formats . . . "extensions"</td>
+    <td>["csv"]</td>
+    <td>format-dependent</td>
+    <td>The extensions of the files that Drill can read.</td>
+  </tr>
+  <tr>
+    <td>"formats" . . . "delimiter"</td>
+    <td>"\t"<br>","</td>
+    <td>format-dependent</td>
+    <td>The delimiter used to separate columns in text files such as CSV. Specify a non-printable delimiter in the storage plugin config by using the form \uXXXX, where XXXX is the four numeral hex ascii code for the character.</td>
+  </tr>
+</table>
+
+The configuration of other attributes, such as `size.calculator.enabled` in the hbase plugin and `configProps` in the hive plugin, are implementation-dependent and beyond the scope of this document.
+
+Although Drill can work with different file types in the same directory, restricting a Drill workspace to one file type prevents confusion.
+
+## Case-sensitive Names
+As previously mentioned, workspace and storage plugin names are case-sensitive. For example, the following query uses a storage plugin name `dfs` and a workspace name `clicks`. When you refer to `dfs.clicks` in an SQL statement, use the defined case:
+
+    0: jdbc:drill:> USE dfs.clicks;
+
+For example, using uppercase letters in the query after defining the storage plugin and workspace names using lowercase letters does not work. 
+
+## REST API
+
+Drill provides a REST API that you can use to create a storage plugin. Use an HTTP POST and pass two properties:
+
+* name
+  The plugin name. 
+
+* config
+  The storage plugin definition as you would enter it in the Web UI.
+
+For example, this command creates a plugin named myplugin for reading files of an unknown type located on the root of the file system:
+
+    curl -X POST -/json" -d '{"name":"myplugin", "config": {"type": "file", "enabled": false, "connection": "file:///", "workspaces": { "root": { "location": "/", "writable": false, "defaultInputFormat": null}}, "formats": null}}' http://localhost:8047/storage/myplugin.json
+
+## Bootstrapping a Storage Plugin
+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.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/050-file-system-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/050-file-system-storage-plugin.md b/_docs/connect-a-data-source/050-file-system-storage-plugin.md
new file mode 100644
index 0000000..2b3e287
--- /dev/null
+++ b/_docs/connect-a-data-source/050-file-system-storage-plugin.md
@@ -0,0 +1,64 @@
+---
+title: "File System Storage Plugin"
+parent: "Storage Plugin Configuration"
+---
+You can register a storage plugin instance that connects Drill to a local file
+system or a distributed file system registered in `core-site.xml`, such as S3
+or HDFS. When you register a storage plugin instance for a file system,
+provide a unique name for the instance, and identify the type as “`file`”. By
+default, Drill includes an instance named `dfs` that points to the local file
+system on your machine. You can update this configuration to point to a
+distributed file system or you can create a new instance to point to a
+distributed file system.
+
+To register a local or a distributed file system with Apache Drill, complete
+the following steps:
+
+  1. Navigate to `[http://localhost:8047](http://localhost:8047/)`, and select the **Storage** tab.
+  2. In the New Storage Plugin window, enter a unique name and then click **Create**.
+  3. In the Configuration window, provide the following configuration information for the type of file system that you are configuring as a data source.
+     1. Local file system example:
+
+            {
+              "type": "file",
+              "enabled": true,
+              "connection": "file:///",
+              "workspaces": {
+                "root": {
+                  "location": "/user/max/donuts",
+                  "writable": false,
+                  "defaultinputformat": null
+                 }
+              },
+                 "formats" : {
+                   "json" : {
+                     "type" : "json"
+                   }
+                 }
+              }
+     2. Distributed file system example:
+    
+            {
+              "type" : "file",
+              "enabled" : true,
+              "connection" : "hdfs://10.10.30.156:8020/",
+              "workspaces" : {
+                "root : {
+                  "location" : "/user/root/drill",
+                  "writable" : true,
+                  "defaultinputformat" : "null"
+                }
+              },
+              "formats" : {
+                "json" : {
+                  "type" : "json"
+                }
+              }
+            }
+
+      To connect to a Hadoop file system, you must include the IP address of the
+name node and the port number.
+  4. Click **Enable**.
+
+Once you have configured a storage plugin instance for the file system, you
+can issue Drill queries against it.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/050-reg-fs.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/050-reg-fs.md b/_docs/connect-a-data-source/050-reg-fs.md
deleted file mode 100644
index 2b3e287..0000000
--- a/_docs/connect-a-data-source/050-reg-fs.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-title: "File System Storage Plugin"
-parent: "Storage Plugin Configuration"
----
-You can register a storage plugin instance that connects Drill to a local file
-system or a distributed file system registered in `core-site.xml`, such as S3
-or HDFS. When you register a storage plugin instance for a file system,
-provide a unique name for the instance, and identify the type as “`file`”. By
-default, Drill includes an instance named `dfs` that points to the local file
-system on your machine. You can update this configuration to point to a
-distributed file system or you can create a new instance to point to a
-distributed file system.
-
-To register a local or a distributed file system with Apache Drill, complete
-the following steps:
-
-  1. Navigate to `[http://localhost:8047](http://localhost:8047/)`, and select the **Storage** tab.
-  2. In the New Storage Plugin window, enter a unique name and then click **Create**.
-  3. In the Configuration window, provide the following configuration information for the type of file system that you are configuring as a data source.
-     1. Local file system example:
-
-            {
-              "type": "file",
-              "enabled": true,
-              "connection": "file:///",
-              "workspaces": {
-                "root": {
-                  "location": "/user/max/donuts",
-                  "writable": false,
-                  "defaultinputformat": null
-                 }
-              },
-                 "formats" : {
-                   "json" : {
-                     "type" : "json"
-                   }
-                 }
-              }
-     2. Distributed file system example:
-    
-            {
-              "type" : "file",
-              "enabled" : true,
-              "connection" : "hdfs://10.10.30.156:8020/",
-              "workspaces" : {
-                "root : {
-                  "location" : "/user/root/drill",
-                  "writable" : true,
-                  "defaultinputformat" : "null"
-                }
-              },
-              "formats" : {
-                "json" : {
-                  "type" : "json"
-                }
-              }
-            }
-
-      To connect to a Hadoop file system, you must include the IP address of the
-name node and the port number.
-  4. Click **Enable**.
-
-Once you have configured a storage plugin instance for the file system, you
-can issue Drill queries against it.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/060-hbase-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/060-hbase-storage-plugin.md b/_docs/connect-a-data-source/060-hbase-storage-plugin.md
new file mode 100644
index 0000000..a8029df
--- /dev/null
+++ b/_docs/connect-a-data-source/060-hbase-storage-plugin.md
@@ -0,0 +1,37 @@
+---
+title: "HBase Storage Plugin"
+parent: "Storage Plugin Configuration"
+---
+Register a storage plugin instance and specify a zookeeper quorum to connect
+Drill to an HBase data source. When you register a storage plugin instance for
+an HBase data source, provide a unique name for the instance, and identify the
+type as “hbase” in the Drill Web UI.
+
+Drill supports HBase version 0.98.
+
+To register HBase with Drill, complete the following steps:
+
+  1. Navigate to [http://localhost:8047](http://localhost:8047/), and select the **Storage** tab
+  2. In the disabled storage plugins section, click **Update** next to the `hbase` instance.
+  3. In the Configuration window, specify the Zookeeper quorum and port. 
+  
+
+     **Example**
+        {
+          "type": "hbase",
+          "config": {
+            "hbase.zookeeper.quorum": "10.10.100.62,10.10.10.52,10.10.10.53",
+            "hbase.zookeeper.property.clientPort": "2181"
+          },
+          "size.calculator.enabled": false,
+          "enabled": true
+        }
+
+  4. Click **Enable**.
+
+The hbase.zookeeper.property.clientPort shown here and in the default hbase storage plugin is 2181. In a MapR cluster, the port is 5181; however, in a MapR cluster, use the maprdb storage plugin format instead of the hbase storage plugin. 
+
+After you configure a storage plugin instance for the HBase, you can
+issue Drill queries against it.
+
+In the Drill sandbox, use the `dfs` storage plugin and the [MapR-DB format]({{ site.baseurl }}/docs/mapr-db-format/) to query HBase files because the sandbox does not include HBase services.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/060-reg-hbase.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/060-reg-hbase.md b/_docs/connect-a-data-source/060-reg-hbase.md
deleted file mode 100644
index a8029df..0000000
--- a/_docs/connect-a-data-source/060-reg-hbase.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-title: "HBase Storage Plugin"
-parent: "Storage Plugin Configuration"
----
-Register a storage plugin instance and specify a zookeeper quorum to connect
-Drill to an HBase data source. When you register a storage plugin instance for
-an HBase data source, provide a unique name for the instance, and identify the
-type as “hbase” in the Drill Web UI.
-
-Drill supports HBase version 0.98.
-
-To register HBase with Drill, complete the following steps:
-
-  1. Navigate to [http://localhost:8047](http://localhost:8047/), and select the **Storage** tab
-  2. In the disabled storage plugins section, click **Update** next to the `hbase` instance.
-  3. In the Configuration window, specify the Zookeeper quorum and port. 
-  
-
-     **Example**
-        {
-          "type": "hbase",
-          "config": {
-            "hbase.zookeeper.quorum": "10.10.100.62,10.10.10.52,10.10.10.53",
-            "hbase.zookeeper.property.clientPort": "2181"
-          },
-          "size.calculator.enabled": false,
-          "enabled": true
-        }
-
-  4. Click **Enable**.
-
-The hbase.zookeeper.property.clientPort shown here and in the default hbase storage plugin is 2181. In a MapR cluster, the port is 5181; however, in a MapR cluster, use the maprdb storage plugin format instead of the hbase storage plugin. 
-
-After you configure a storage plugin instance for the HBase, you can
-issue Drill queries against it.
-
-In the Drill sandbox, use the `dfs` storage plugin and the [MapR-DB format]({{ site.baseurl }}/docs/mapr-db-format/) to query HBase files because the sandbox does not include HBase services.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/070-hive-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/070-hive-storage-plugin.md b/_docs/connect-a-data-source/070-hive-storage-plugin.md
new file mode 100644
index 0000000..146dde8
--- /dev/null
+++ b/_docs/connect-a-data-source/070-hive-storage-plugin.md
@@ -0,0 +1,77 @@
+---
+title: "Hive Storage Plugin"
+parent: "Storage Plugin Configuration"
+---
+You can register a storage plugin instance that connects Drill to a Hive data
+source that has a remote or embedded metastore service. When you register a
+storage plugin instance for a Hive data source, provide a unique name for the
+instance, and identify the type as “`hive`”. You must also provide the
+metastore connection information.
+
+Drill supports Hive 0.13. To access Hive tables
+using custom SerDes or InputFormat/OutputFormat, all nodes running Drillbits
+must have the SerDes or InputFormat/OutputFormat `JAR` files in the 
+`<drill_installation_directory>/jars/3rdparty` folder.
+
+## Hive Remote Metastore
+
+In this configuration, the Hive metastore runs as a separate service outside
+of Hive. Drill communicates with the Hive metastore through Thrift. The
+metastore service communicates with the Hive database over JDBC. Point Drill
+to the Hive metastore service address, and provide the connection parameters
+in the Drill Web UI to configure a connection to Drill.
+
+{% include startnote.html %}Verify that the Hive metastore service is running before you register the Hive metastore.{% include endnote.html %}
+
+To register a remote Hive metastore with Drill, complete the following steps:
+
+  1. Issue the following command to start the Hive metastore service on the system specified in the `hive.metastore.uris`:
+
+        hive --service metastore
+  2. Navigate to [http://localhost:8047](http://localhost:8047/), and select the **Storage** tab.
+  3. In the disabled storage plugins section, click **Update** next to the `hive` instance.
+  4. In the configuration window, add the `Thrift URI` and port to `hive.metastore.uris`.
+
+     **Example**
+     
+        {
+          "type": "hive",
+          "enabled": true,
+          "configProps": {
+            "hive.metastore.uris": "thrift://<localhost>:<port>",  
+            "hive.metastore.sasl.enabled": "false"
+          }
+        }       
+  5. Click **Enable**.
+  6. Verify that `HADOOP_CLASSPATH` is set in `drill-env.sh`. If you need to set the classpath, add the following line to `drill-env.sh`.
+
+Once you have configured a storage plugin instance for a Hive data source, you
+can [query Hive tables]({{ site.baseurl }}/docs/querying-hive/).
+
+## Hive Embedded Metastore
+
+In this configuration, the Hive metastore is embedded within the Drill process. Provide the metastore database configuration settings in the Drill Web UI. Before you register Hive, verify that the driver you use to connect to the Hive metastore is in the Drill classpath located in `/<drill installation dirctory>/lib/.` If the driver is not there, copy the driver to `/<drill
+installation directory>/lib` on the Drill node. For more information about storage types and configurations, refer to ["Hive Metastore Administration"](https://cwiki.apache.org/confluence/display/Hive/AdminManual+MetastoreAdmin).
+
+To register an embedded Hive metastore with Drill, complete the following
+steps:
+
+  1. Navigate to `[http://localhost:8047](http://localhost:8047/)`, and select the **Storage** tab
+  2. In the disabled storage plugins section, click **Update** next to `hive` instance.
+  3. In the configuration window, add the database configuration settings.
+
+     **Example**
+     
+        {
+          "type": "hive",
+          "enabled": true,
+          "configProps": {
+            "javax.jdo.option.ConnectionURL": "jdbc:<database>://<host:port>/<metastore database>;create=true",
+            "hive.metastore.warehouse.dir": "/tmp/drill_hive_wh",
+            "fs.default.name": "file:///",   
+          }
+        }
+  4. Click **Enable**.
+  5. Verify that `HADOOP_CLASSPATH` is set in `drill-env.sh`. If you need to set the classpath, add the following line to `drill-env.sh`.
+  
+        export HADOOP_CLASSPATH=/<directory path>/hadoop/hadoop-<version-number>

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/070-reg-hive.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/070-reg-hive.md b/_docs/connect-a-data-source/070-reg-hive.md
deleted file mode 100644
index 146dde8..0000000
--- a/_docs/connect-a-data-source/070-reg-hive.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-title: "Hive Storage Plugin"
-parent: "Storage Plugin Configuration"
----
-You can register a storage plugin instance that connects Drill to a Hive data
-source that has a remote or embedded metastore service. When you register a
-storage plugin instance for a Hive data source, provide a unique name for the
-instance, and identify the type as “`hive`”. You must also provide the
-metastore connection information.
-
-Drill supports Hive 0.13. To access Hive tables
-using custom SerDes or InputFormat/OutputFormat, all nodes running Drillbits
-must have the SerDes or InputFormat/OutputFormat `JAR` files in the 
-`<drill_installation_directory>/jars/3rdparty` folder.
-
-## Hive Remote Metastore
-
-In this configuration, the Hive metastore runs as a separate service outside
-of Hive. Drill communicates with the Hive metastore through Thrift. The
-metastore service communicates with the Hive database over JDBC. Point Drill
-to the Hive metastore service address, and provide the connection parameters
-in the Drill Web UI to configure a connection to Drill.
-
-{% include startnote.html %}Verify that the Hive metastore service is running before you register the Hive metastore.{% include endnote.html %}
-
-To register a remote Hive metastore with Drill, complete the following steps:
-
-  1. Issue the following command to start the Hive metastore service on the system specified in the `hive.metastore.uris`:
-
-        hive --service metastore
-  2. Navigate to [http://localhost:8047](http://localhost:8047/), and select the **Storage** tab.
-  3. In the disabled storage plugins section, click **Update** next to the `hive` instance.
-  4. In the configuration window, add the `Thrift URI` and port to `hive.metastore.uris`.
-
-     **Example**
-     
-        {
-          "type": "hive",
-          "enabled": true,
-          "configProps": {
-            "hive.metastore.uris": "thrift://<localhost>:<port>",  
-            "hive.metastore.sasl.enabled": "false"
-          }
-        }       
-  5. Click **Enable**.
-  6. Verify that `HADOOP_CLASSPATH` is set in `drill-env.sh`. If you need to set the classpath, add the following line to `drill-env.sh`.
-
-Once you have configured a storage plugin instance for a Hive data source, you
-can [query Hive tables]({{ site.baseurl }}/docs/querying-hive/).
-
-## Hive Embedded Metastore
-
-In this configuration, the Hive metastore is embedded within the Drill process. Provide the metastore database configuration settings in the Drill Web UI. Before you register Hive, verify that the driver you use to connect to the Hive metastore is in the Drill classpath located in `/<drill installation dirctory>/lib/.` If the driver is not there, copy the driver to `/<drill
-installation directory>/lib` on the Drill node. For more information about storage types and configurations, refer to ["Hive Metastore Administration"](https://cwiki.apache.org/confluence/display/Hive/AdminManual+MetastoreAdmin).
-
-To register an embedded Hive metastore with Drill, complete the following
-steps:
-
-  1. Navigate to `[http://localhost:8047](http://localhost:8047/)`, and select the **Storage** tab
-  2. In the disabled storage plugins section, click **Update** next to `hive` instance.
-  3. In the configuration window, add the database configuration settings.
-
-     **Example**
-     
-        {
-          "type": "hive",
-          "enabled": true,
-          "configProps": {
-            "javax.jdo.option.ConnectionURL": "jdbc:<database>://<host:port>/<metastore database>;create=true",
-            "hive.metastore.warehouse.dir": "/tmp/drill_hive_wh",
-            "fs.default.name": "file:///",   
-          }
-        }
-  4. Click **Enable**.
-  5. Verify that `HADOOP_CLASSPATH` is set in `drill-env.sh`. If you need to set the classpath, add the following line to `drill-env.sh`.
-  
-        export HADOOP_CLASSPATH=/<directory path>/hadoop/hadoop-<version-number>

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/080-default-frmt.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/080-default-frmt.md b/_docs/connect-a-data-source/080-default-frmt.md
deleted file mode 100644
index e817343..0000000
--- a/_docs/connect-a-data-source/080-default-frmt.md
+++ /dev/null
@@ -1,69 +0,0 @@
----
-title: "Drill Default Input Format"
-parent: "Storage Plugin Configuration"
----
-You can define a default input format to tell Drill what file type exists in a
-workspace within a file system. Drill determines the file type based on file
-extensions and magic numbers when searching a workspace.
-
-Magic numbers are file signatures that Drill uses to identify Parquet files.
-If Drill cannot identify the file type based on file extensions or magic
-numbers, the query fails. Defining a default input format can prevent queries
-from failing in situations where Drill cannot determine the file type.
-
-If you incorrectly define the file type in a workspace and Drill cannot
-determine the file type, the query fails. For example, if the directory for
-which you have defined a workspace contains JSON files and you defined the
-default input format as CSV, the query fails against the workspace.
-
-You can define one default input format per workspace. If you do not define a
-default input format, and Drill cannot detect the file format, the query
-fails. You can define a default input format for any of the file types that
-Drill supports. Currently, Drill supports the following types:
-
-  * CSV
-  * TSV
-  * PSV
-  * Parquet
-  * JSON
-
-## Defining a Default Input Format
-
-You define the default input format for a file system workspace through the
-Drill Web UI. You must have a [defined workspace]({{ site.baseurl }}/docs/workspaces) before you can define a
-default input format.
-
-To define a default input format for a workspace, complete the following
-steps:
-
-  1. Navigate to the Drill Web UI at `<drill_node_ip_address>:8047`. The Drillbit process must be running on the node before you connect to the Drill Web UI.
-  2. Select **Storage** in the toolbar.
-  3. Click **Update** next to the file system for which you want to define a default input format for a workspace.
-  4. In the Configuration area, locate the workspace for which you would like to define the default input format, and change the `defaultInputFormat` attribute to any of the supported file types.
-
-     **Example**
-     
-        {
-          "type": "file",
-          "enabled": true,
-          "connection": "hdfs:///",
-          "workspaces": {
-            "root": {
-              "location": "/drill/testdata",
-              "writable": false,
-              "defaultInputFormat": csv
-          },
-          "local" : {
-            "location" : "/max/proddata",
-            "writable" : true,
-            "defaultInputFormat" : "json"
-        }
-
-## Querying Compressed JSON
-
-You can use Drill 0.8 and later to query compressed JSON in .gz files as well as uncompressed files having the .json extension. First, add the gz extension to a storage plugin, and then use that plugin to query the compressed file.
-
-      "extensions": [
-        "json",
-        "gz"
-      ]

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/080-drill-default-input-format.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/080-drill-default-input-format.md b/_docs/connect-a-data-source/080-drill-default-input-format.md
new file mode 100644
index 0000000..e817343
--- /dev/null
+++ b/_docs/connect-a-data-source/080-drill-default-input-format.md
@@ -0,0 +1,69 @@
+---
+title: "Drill Default Input Format"
+parent: "Storage Plugin Configuration"
+---
+You can define a default input format to tell Drill what file type exists in a
+workspace within a file system. Drill determines the file type based on file
+extensions and magic numbers when searching a workspace.
+
+Magic numbers are file signatures that Drill uses to identify Parquet files.
+If Drill cannot identify the file type based on file extensions or magic
+numbers, the query fails. Defining a default input format can prevent queries
+from failing in situations where Drill cannot determine the file type.
+
+If you incorrectly define the file type in a workspace and Drill cannot
+determine the file type, the query fails. For example, if the directory for
+which you have defined a workspace contains JSON files and you defined the
+default input format as CSV, the query fails against the workspace.
+
+You can define one default input format per workspace. If you do not define a
+default input format, and Drill cannot detect the file format, the query
+fails. You can define a default input format for any of the file types that
+Drill supports. Currently, Drill supports the following types:
+
+  * CSV
+  * TSV
+  * PSV
+  * Parquet
+  * JSON
+
+## Defining a Default Input Format
+
+You define the default input format for a file system workspace through the
+Drill Web UI. You must have a [defined workspace]({{ site.baseurl }}/docs/workspaces) before you can define a
+default input format.
+
+To define a default input format for a workspace, complete the following
+steps:
+
+  1. Navigate to the Drill Web UI at `<drill_node_ip_address>:8047`. The Drillbit process must be running on the node before you connect to the Drill Web UI.
+  2. Select **Storage** in the toolbar.
+  3. Click **Update** next to the file system for which you want to define a default input format for a workspace.
+  4. In the Configuration area, locate the workspace for which you would like to define the default input format, and change the `defaultInputFormat` attribute to any of the supported file types.
+
+     **Example**
+     
+        {
+          "type": "file",
+          "enabled": true,
+          "connection": "hdfs:///",
+          "workspaces": {
+            "root": {
+              "location": "/drill/testdata",
+              "writable": false,
+              "defaultInputFormat": csv
+          },
+          "local" : {
+            "location" : "/max/proddata",
+            "writable" : true,
+            "defaultInputFormat" : "json"
+        }
+
+## Querying Compressed JSON
+
+You can use Drill 0.8 and later to query compressed JSON in .gz files as well as uncompressed files having the .json extension. First, add the gz extension to a storage plugin, and then use that plugin to query the compressed file.
+
+      "extensions": [
+        "json",
+        "gz"
+      ]

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/090-mongo-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/090-mongo-plugin.md b/_docs/connect-a-data-source/090-mongo-plugin.md
deleted file mode 100644
index 9e2d41e..0000000
--- a/_docs/connect-a-data-source/090-mongo-plugin.md
+++ /dev/null
@@ -1,169 +0,0 @@
----
-title: "MongoDB Plugin for Apache Drill"
-parent: "Connect a Data Source"
----
-## Overview
-
-You can leverage the power of Apache Drill to query data without any upfront
-schema definitions. Drill enables you to create an architecture that works
-with nested and dynamic schemas, making it the perfect SQL query tool to use
-on NoSQL databases, such as MongoDB.
-
-As of Apache Drill 0.6, you can configure MongoDB as a Drill data source.
-Drill provides a mongodb format plugin to connect to MongoDB, and run queries
-on the data using ANSI SQL.
-
-This tutorial assumes that you have Drill installed locally (embedded mode),
-as well as MongoDB. Examples in this tutorial use zip code aggregation data
-provided by MongoDB. Before You Begin provides links to download tools and data
-used throughout the tutorial.
-
-{% include startnote.html %}A local instance of Drill is used in this tutorial for simplicity. {% include endnote.html %}
-
-You can also run Drill and MongoDB together in distributed mode.
-
-### Before You Begin
-
-Before you can query MongoDB with Drill, you must have Drill and MongoDB
-installed on your machine. You may also want to import the MongoDB zip code
-data to run the example queries on your machine.
-
-  1. [Install Drill]({{ site.baseurl }}/docs/installing-drill-in-embedded-mode), if you do not already have it installed on your machine.
-  2. [Install MongoDB](http://docs.mongodb.org/manual/installation), if you do not already have it installed on your machine.
-  3. [Import the MongoDB zip code sample data set](http://docs.mongodb.org/manual/tutorial/aggregation-zip-code-data-set). You can use Mongo Import to get the data. 
-
-## Configuring MongoDB
-
-Start Drill and configure the MongoDB storage plugin instance in the Drill Web
-UI to connect to Drill. Drill must be running in order to access the Web UI.
-
-Complete the following steps to configure MongoDB as a data source for Drill:
-
-  1. Navigate to `<drill_installation_directory>/drill-<version>,` and enter the following command to invoke SQLLine and start Drill:
-
-        bin/sqlline -u jdbc:drill:zk=local -n admin -p admin
-     When Drill starts, the following prompt appears: `0: jdbc:drill:zk=local>`
-
-     Do not enter any commands. You will return to the command prompt after
-completing the configuration in the Drill Web UI.
-  2. Open a browser window, and navigate to the Drill Web UI at `http://localhost:8047`.
-  3. In the navigation bar, click **Storage**.
-  4. Under Disabled Storage Plugins, select **Update** next to the `mongo` instance if the instance exists. If the instance does not exist, create an instance for MongoDB.
-  5. In the Configuration window, verify that `"enabled"` is set to ``"true."``
-
-     **Example**
-     
-        {
-          "type": "mongo",
-          "connection": "mongodb://localhost:27017/",
-          "enabled": true
-        }
-
-     {% include startnote.html %}27017 is the default port for `mongodb` instances.{% include endnote.html %} 
-  6. Click **Enable** to enable the instance, and save the configuration.
-  7. Navigate back to the Drill command line so you can query MongoDB.
-
-## Querying MongoDB
-
-You can issue the `SHOW DATABASES `command to see a list of databases from all
-Drill data sources, including MongoDB. If you downloaded the zip codes file,
-you should see `mongo.zipdb` in the results.
-
-    0: jdbc:drill:zk=local> SHOW DATABASES;
-    +-------------+
-    | SCHEMA_NAME |
-    +-------------+
-    | dfs.default |
-    | dfs.root    |
-    | dfs.tmp     |
-    | sys         |
-    | mongo.zipdb |
-    | cp.default  |
-    | INFORMATION_SCHEMA |
-    +-------------+
-
-If you want all queries that you submit to run on `mongo.zipdb`, you can issue
-the `USE` command to change schema.
-
-### Example Queries
-
-The following example queries are included for reference. However, you can use
-the SQL power of Apache Drill directly on MongoDB. For more information about,
-refer to the [SQL
-Reference]({{ site.baseurl }}/docs/sql-reference).
-
-**Example 1: View mongo.zipdb Dataset**
-
-    0: jdbc:drill:zk=local> SELECT * FROM zipcodes LIMIT 10;
-    +------------+
-    |     *      |
-    +------------+
-    | { "city" : "AGAWAM" , "loc" : [ -72.622739 , 42.070206] , "pop" : 15338 , "state" : "MA"} |
-    | { "city" : "CUSHMAN" , "loc" : [ -72.51565 , 42.377017] , "pop" : 36963 , "state" : "MA"} |
-    | { "city" : "BARRE" , "loc" : [ -72.108354 , 42.409698] , "pop" : 4546 , "state" : "MA"} |
-    | { "city" : "BELCHERTOWN" , "loc" : [ -72.410953 , 42.275103] , "pop" : 10579 , "state" : "MA"} |
-    | { "city" : "BLANDFORD" , "loc" : [ -72.936114 , 42.182949] , "pop" : 1240 , "state" : "MA"} |
-    | { "city" : "BRIMFIELD" , "loc" : [ -72.188455 , 42.116543] , "pop" : 3706 , "state" : "MA"} |
-    | { "city" : "CHESTER" , "loc" : [ -72.988761 , 42.279421] , "pop" : 1688 , "state" : "MA"} |
-    | { "city" : "CHESTERFIELD" , "loc" : [ -72.833309 , 42.38167] , "pop" : 177 , "state" : "MA"} |
-    | { "city" : "CHICOPEE" , "loc" : [ -72.607962 , 42.162046] , "pop" : 23396 , "state" : "MA"} |
-    | { "city" : "CHICOPEE" , "loc" : [ -72.576142 , 42.176443] , "pop" : 31495 , "state" : "MA"} |
-
-**Example 2: Aggregation**
-
-    0: jdbc:drill:zk=local> select state,city,avg(pop)
-    +------------+------------+------------+
-    |   state    |    city    |   EXPR$2   |
-    +------------+------------+------------+
-    | MA         | AGAWAM     | 15338.0    |
-    | MA         | CUSHMAN    | 36963.0    |
-    | MA         | BARRE      | 4546.0     |
-    | MA         | BELCHERTOWN | 10579.0   |
-    | MA         | BLANDFORD  | 1240.0     |
-    | MA         | BRIMFIELD  | 3706.0     |
-    | MA         | CHESTER    | 1688.0     |
-    | MA         | CHESTERFIELD | 177.0    |
-    | MA         | CHICOPEE   | 27445.5    |
-    | MA         | WESTOVER AFB | 1764.0   |
-    +------------+------------+------------+
-
-**Example 3: Nested Data Column Array**
-
-    0: jdbc:drill:zk=local> SELECT loc FROM zipcodes LIMIT 10;
-    +------------------------+
-    |    loc                 |
-    +------------------------+
-    | [-72.622739,42.070206] |
-    | [-72.51565,42.377017]  |
-    | [-72.108354,42.409698] |
-    | [-72.410953,42.275103] |
-    | [-72.936114,42.182949] |
-    | [-72.188455,42.116543] |
-    | [-72.988761,42.279421] |
-    | [-72.833309,42.38167]  |
-    | [-72.607962,42.162046] |
-    | [-72.576142,42.176443] |
-    +------------------------+
-        
-    0: jdbc:drill:zk=local> SELECT loc[0] FROM zipcodes LIMIT 10;
-    +------------+
-    |   EXPR$0   |
-    +------------+
-    | -72.622739 |
-    | -72.51565  |
-    | -72.108354 |
-    | -72.410953 |
-    | -72.936114 |
-    | -72.188455 |
-    | -72.988761 |
-    | -72.833309 |
-    | -72.607962 |
-    | -72.576142 |
-    +------------+
-
-## Using ODBC/JDBC Drivers
-
-You can leverage the power of Apache Drill to query MongoDB through standard
-BI tools, such as Tableau and SQuirreL.
-
-For information about Drill ODBC and JDBC drivers, refer to [Drill Interfaces]({{ site.baseurl }}/docs/odbc-jdbc-interfaces).

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md b/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
new file mode 100644
index 0000000..9e2d41e
--- /dev/null
+++ b/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
@@ -0,0 +1,169 @@
+---
+title: "MongoDB Plugin for Apache Drill"
+parent: "Connect a Data Source"
+---
+## Overview
+
+You can leverage the power of Apache Drill to query data without any upfront
+schema definitions. Drill enables you to create an architecture that works
+with nested and dynamic schemas, making it the perfect SQL query tool to use
+on NoSQL databases, such as MongoDB.
+
+As of Apache Drill 0.6, you can configure MongoDB as a Drill data source.
+Drill provides a mongodb format plugin to connect to MongoDB, and run queries
+on the data using ANSI SQL.
+
+This tutorial assumes that you have Drill installed locally (embedded mode),
+as well as MongoDB. Examples in this tutorial use zip code aggregation data
+provided by MongoDB. Before You Begin provides links to download tools and data
+used throughout the tutorial.
+
+{% include startnote.html %}A local instance of Drill is used in this tutorial for simplicity. {% include endnote.html %}
+
+You can also run Drill and MongoDB together in distributed mode.
+
+### Before You Begin
+
+Before you can query MongoDB with Drill, you must have Drill and MongoDB
+installed on your machine. You may also want to import the MongoDB zip code
+data to run the example queries on your machine.
+
+  1. [Install Drill]({{ site.baseurl }}/docs/installing-drill-in-embedded-mode), if you do not already have it installed on your machine.
+  2. [Install MongoDB](http://docs.mongodb.org/manual/installation), if you do not already have it installed on your machine.
+  3. [Import the MongoDB zip code sample data set](http://docs.mongodb.org/manual/tutorial/aggregation-zip-code-data-set). You can use Mongo Import to get the data. 
+
+## Configuring MongoDB
+
+Start Drill and configure the MongoDB storage plugin instance in the Drill Web
+UI to connect to Drill. Drill must be running in order to access the Web UI.
+
+Complete the following steps to configure MongoDB as a data source for Drill:
+
+  1. Navigate to `<drill_installation_directory>/drill-<version>,` and enter the following command to invoke SQLLine and start Drill:
+
+        bin/sqlline -u jdbc:drill:zk=local -n admin -p admin
+     When Drill starts, the following prompt appears: `0: jdbc:drill:zk=local>`
+
+     Do not enter any commands. You will return to the command prompt after
+completing the configuration in the Drill Web UI.
+  2. Open a browser window, and navigate to the Drill Web UI at `http://localhost:8047`.
+  3. In the navigation bar, click **Storage**.
+  4. Under Disabled Storage Plugins, select **Update** next to the `mongo` instance if the instance exists. If the instance does not exist, create an instance for MongoDB.
+  5. In the Configuration window, verify that `"enabled"` is set to ``"true."``
+
+     **Example**
+     
+        {
+          "type": "mongo",
+          "connection": "mongodb://localhost:27017/",
+          "enabled": true
+        }
+
+     {% include startnote.html %}27017 is the default port for `mongodb` instances.{% include endnote.html %} 
+  6. Click **Enable** to enable the instance, and save the configuration.
+  7. Navigate back to the Drill command line so you can query MongoDB.
+
+## Querying MongoDB
+
+You can issue the `SHOW DATABASES `command to see a list of databases from all
+Drill data sources, including MongoDB. If you downloaded the zip codes file,
+you should see `mongo.zipdb` in the results.
+
+    0: jdbc:drill:zk=local> SHOW DATABASES;
+    +-------------+
+    | SCHEMA_NAME |
+    +-------------+
+    | dfs.default |
+    | dfs.root    |
+    | dfs.tmp     |
+    | sys         |
+    | mongo.zipdb |
+    | cp.default  |
+    | INFORMATION_SCHEMA |
+    +-------------+
+
+If you want all queries that you submit to run on `mongo.zipdb`, you can issue
+the `USE` command to change schema.
+
+### Example Queries
+
+The following example queries are included for reference. However, you can use
+the SQL power of Apache Drill directly on MongoDB. For more information about,
+refer to the [SQL
+Reference]({{ site.baseurl }}/docs/sql-reference).
+
+**Example 1: View mongo.zipdb Dataset**
+
+    0: jdbc:drill:zk=local> SELECT * FROM zipcodes LIMIT 10;
+    +------------+
+    |     *      |
+    +------------+
+    | { "city" : "AGAWAM" , "loc" : [ -72.622739 , 42.070206] , "pop" : 15338 , "state" : "MA"} |
+    | { "city" : "CUSHMAN" , "loc" : [ -72.51565 , 42.377017] , "pop" : 36963 , "state" : "MA"} |
+    | { "city" : "BARRE" , "loc" : [ -72.108354 , 42.409698] , "pop" : 4546 , "state" : "MA"} |
+    | { "city" : "BELCHERTOWN" , "loc" : [ -72.410953 , 42.275103] , "pop" : 10579 , "state" : "MA"} |
+    | { "city" : "BLANDFORD" , "loc" : [ -72.936114 , 42.182949] , "pop" : 1240 , "state" : "MA"} |
+    | { "city" : "BRIMFIELD" , "loc" : [ -72.188455 , 42.116543] , "pop" : 3706 , "state" : "MA"} |
+    | { "city" : "CHESTER" , "loc" : [ -72.988761 , 42.279421] , "pop" : 1688 , "state" : "MA"} |
+    | { "city" : "CHESTERFIELD" , "loc" : [ -72.833309 , 42.38167] , "pop" : 177 , "state" : "MA"} |
+    | { "city" : "CHICOPEE" , "loc" : [ -72.607962 , 42.162046] , "pop" : 23396 , "state" : "MA"} |
+    | { "city" : "CHICOPEE" , "loc" : [ -72.576142 , 42.176443] , "pop" : 31495 , "state" : "MA"} |
+
+**Example 2: Aggregation**
+
+    0: jdbc:drill:zk=local> select state,city,avg(pop)
+    +------------+------------+------------+
+    |   state    |    city    |   EXPR$2   |
+    +------------+------------+------------+
+    | MA         | AGAWAM     | 15338.0    |
+    | MA         | CUSHMAN    | 36963.0    |
+    | MA         | BARRE      | 4546.0     |
+    | MA         | BELCHERTOWN | 10579.0   |
+    | MA         | BLANDFORD  | 1240.0     |
+    | MA         | BRIMFIELD  | 3706.0     |
+    | MA         | CHESTER    | 1688.0     |
+    | MA         | CHESTERFIELD | 177.0    |
+    | MA         | CHICOPEE   | 27445.5    |
+    | MA         | WESTOVER AFB | 1764.0   |
+    +------------+------------+------------+
+
+**Example 3: Nested Data Column Array**
+
+    0: jdbc:drill:zk=local> SELECT loc FROM zipcodes LIMIT 10;
+    +------------------------+
+    |    loc                 |
+    +------------------------+
+    | [-72.622739,42.070206] |
+    | [-72.51565,42.377017]  |
+    | [-72.108354,42.409698] |
+    | [-72.410953,42.275103] |
+    | [-72.936114,42.182949] |
+    | [-72.188455,42.116543] |
+    | [-72.988761,42.279421] |
+    | [-72.833309,42.38167]  |
+    | [-72.607962,42.162046] |
+    | [-72.576142,42.176443] |
+    +------------------------+
+        
+    0: jdbc:drill:zk=local> SELECT loc[0] FROM zipcodes LIMIT 10;
+    +------------+
+    |   EXPR$0   |
+    +------------+
+    | -72.622739 |
+    | -72.51565  |
+    | -72.108354 |
+    | -72.410953 |
+    | -72.936114 |
+    | -72.188455 |
+    | -72.988761 |
+    | -72.833309 |
+    | -72.607962 |
+    | -72.576142 |
+    +------------+
+
+## Using ODBC/JDBC Drivers
+
+You can leverage the power of Apache Drill to query MongoDB through standard
+BI tools, such as Tableau and SQuirreL.
+
+For information about Drill ODBC and JDBC drivers, refer to [Drill Interfaces]({{ site.baseurl }}/docs/odbc-jdbc-interfaces).

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_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
new file mode 100644
index 0000000..f00d2d2
--- /dev/null
+++ b/_docs/connect-a-data-source/100-mapr-db-format.md
@@ -0,0 +1,34 @@
+---
+title: "MapR-DB Format"
+parent: "Connect a Data Source"
+---
+Drill includes a `maprdb` format plugin for accessing data stored in MapR-DB. The Drill Sandbox also includes the following `maprdb` format plugin on a MapR node:
+
+    {
+      "type": "hbase",
+      "config": {
+        "hbase.table.namespace.mappings": "*:/tables"
+      },
+      "size.calculator.enabled": false,
+      "enabled": true
+    }
+
+Using the Sandbox and this `maprdb` format plugin, you can query HBase tables located in the `/tables` directory, as shown in the ["Query HBase"]({{ site.baseurl }}/docs/querying-hbase) examples.
+
+The `dfs` storage plugin includes the maprdb format when you install Drill from the `mapr-drill` package on a MapR node. Click **Update** next to the `dfs` instance
+in the Web UI of the Drill Sandbox to view the configuration for the `dfs` instance:
+
+![drill query flow]({{ site.baseurl }}/docs/img/18.png)
+
+
+The examples of the [CONVERT_TO/FROM functions]({{ site.baseurl }}/docs/data-type-conversion#convert_to-and-convert_from) show how to adapt the `dfs` storage plugin to use the `maprdb` format plugin to query HBase tables on the Sandbox.
+
+You modify the `dfs` storage plugin to create a table mapping to a directory in the MapR-FS file system. You then select the table by name.
+
+**Example**
+
+    SELECT * FROM myplugin.`mytable`;
+
+The `maprdb` format plugin improves the
+estimated number of rows that Drill uses to plan a query. Using the `dfs` storage plugin, you can query HBase and MapR-DB tables as you would query files in a file system. MapR-DB, MapR-FS, and Hadoop files share the same namespace.
+

http://git-wip-us.apache.org/repos/asf/drill/blob/48269506/_docs/connect-a-data-source/100-mapr-db-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/100-mapr-db-plugin.md b/_docs/connect-a-data-source/100-mapr-db-plugin.md
deleted file mode 100644
index f00d2d2..0000000
--- a/_docs/connect-a-data-source/100-mapr-db-plugin.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: "MapR-DB Format"
-parent: "Connect a Data Source"
----
-Drill includes a `maprdb` format plugin for accessing data stored in MapR-DB. The Drill Sandbox also includes the following `maprdb` format plugin on a MapR node:
-
-    {
-      "type": "hbase",
-      "config": {
-        "hbase.table.namespace.mappings": "*:/tables"
-      },
-      "size.calculator.enabled": false,
-      "enabled": true
-    }
-
-Using the Sandbox and this `maprdb` format plugin, you can query HBase tables located in the `/tables` directory, as shown in the ["Query HBase"]({{ site.baseurl }}/docs/querying-hbase) examples.
-
-The `dfs` storage plugin includes the maprdb format when you install Drill from the `mapr-drill` package on a MapR node. Click **Update** next to the `dfs` instance
-in the Web UI of the Drill Sandbox to view the configuration for the `dfs` instance:
-
-![drill query flow]({{ site.baseurl }}/docs/img/18.png)
-
-
-The examples of the [CONVERT_TO/FROM functions]({{ site.baseurl }}/docs/data-type-conversion#convert_to-and-convert_from) show how to adapt the `dfs` storage plugin to use the `maprdb` format plugin to query HBase tables on the Sandbox.
-
-You modify the `dfs` storage plugin to create a table mapping to a directory in the MapR-FS file system. You then select the table by name.
-
-**Example**
-
-    SELECT * FROM myplugin.`mytable`;
-
-The `maprdb` format plugin improves the
-estimated number of rows that Drill uses to plan a query. Using the `dfs` storage plugin, you can query HBase and MapR-DB tables as you would query files in a file system. MapR-DB, MapR-FS, and Hadoop files share the same namespace.
-


[06/50] [abbrv] drill git commit: docs file

Posted by ts...@apache.org.
docs file


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

Branch: refs/heads/gh-pages
Commit: 41da95bc836493be604db6b8c0d2af354f9c5fdd
Parents: 4826950
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Apr 29 15:21:11 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Apr 29 15:21:11 2015 -0700

----------------------------------------------------------------------
 _data/docs.json | 168 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 126 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/41da95bc/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index d191c6e..79468f4 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -910,7 +910,7 @@
                     "parent": "Connect a Data Source", 
                     "previous_title": "Connect a Data Source Introduction", 
                     "previous_url": "/docs/connect-a-data-source-introduction/", 
-                    "relative_path": "_docs/connect-a-data-source/020-plugin-reg.md", 
+                    "relative_path": "_docs/connect-a-data-source/020-storage-plugin-registration.md", 
                     "title": "Storage Plugin Registration", 
                     "url": "/docs/storage-plugin-registration/"
                 }, 
@@ -934,11 +934,32 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "File System Storage Plugin", 
-                            "next_url": "/docs/file-system-storage-plugin/", 
+                            "next_title": "Workspaces", 
+                            "next_url": "/docs/workspaces/", 
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Storage Plugin Configuration", 
                             "previous_url": "/docs/storage-plugin-configuration/", 
+                            "relative_path": "_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md", 
+                            "title": "Storage Plugin Configuration Introduction", 
+                            "url": "/docs/storage-plugin-configuration-introduction/"
+                        }, 
+                        {
+                            "breadcrumbs": [
+                                {
+                                    "title": "Storage Plugin Configuration", 
+                                    "url": "/docs/storage-plugin-configuration/"
+                                }, 
+                                {
+                                    "title": "Connect a Data Source", 
+                                    "url": "/docs/connect-a-data-source/"
+                                }
+                            ], 
+                            "children": [], 
+                            "next_title": "File System Storage Plugin", 
+                            "next_url": "/docs/file-system-storage-plugin/", 
+                            "parent": "Storage Plugin Configuration", 
+                            "previous_title": "Storage Plugin Configuration Introduction", 
+                            "previous_url": "/docs/storage-plugin-configuration-introduction/", 
                             "relative_path": "_docs/connect-a-data-source/040-workspaces.md", 
                             "title": "Workspaces", 
                             "url": "/docs/workspaces/"
@@ -960,7 +981,7 @@
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Workspaces", 
                             "previous_url": "/docs/workspaces/", 
-                            "relative_path": "_docs/connect-a-data-source/050-reg-fs.md", 
+                            "relative_path": "_docs/connect-a-data-source/050-file-system-storage-plugin.md", 
                             "title": "File System Storage Plugin", 
                             "url": "/docs/file-system-storage-plugin/"
                         }, 
@@ -981,7 +1002,7 @@
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "File System Storage Plugin", 
                             "previous_url": "/docs/file-system-storage-plugin/", 
-                            "relative_path": "_docs/connect-a-data-source/060-reg-hbase.md", 
+                            "relative_path": "_docs/connect-a-data-source/060-hbase-storage-plugin.md", 
                             "title": "HBase Storage Plugin", 
                             "url": "/docs/hbase-storage-plugin/"
                         }, 
@@ -1002,7 +1023,7 @@
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "HBase Storage Plugin", 
                             "previous_url": "/docs/hbase-storage-plugin/", 
-                            "relative_path": "_docs/connect-a-data-source/070-reg-hive.md", 
+                            "relative_path": "_docs/connect-a-data-source/070-hive-storage-plugin.md", 
                             "title": "Hive Storage Plugin", 
                             "url": "/docs/hive-storage-plugin/"
                         }, 
@@ -1023,17 +1044,17 @@
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Hive Storage Plugin", 
                             "previous_url": "/docs/hive-storage-plugin/", 
-                            "relative_path": "_docs/connect-a-data-source/080-default-frmt.md", 
+                            "relative_path": "_docs/connect-a-data-source/080-drill-default-input-format.md", 
                             "title": "Drill Default Input Format", 
                             "url": "/docs/drill-default-input-format/"
                         }
                     ], 
-                    "next_title": "Workspaces", 
-                    "next_url": "/docs/workspaces/", 
+                    "next_title": "Storage Plugin Configuration Introduction", 
+                    "next_url": "/docs/storage-plugin-configuration-introduction/", 
                     "parent": "Connect a Data Source", 
                     "previous_title": "Storage Plugin Registration", 
                     "previous_url": "/docs/storage-plugin-registration/", 
-                    "relative_path": "_docs/connect-a-data-source/030-plugin-conf.md", 
+                    "relative_path": "_docs/connect-a-data-source/030-storage-plugin-configuration.md", 
                     "title": "Storage Plugin Configuration", 
                     "url": "/docs/storage-plugin-configuration/"
                 }, 
@@ -1050,7 +1071,7 @@
                     "parent": "Connect a Data Source", 
                     "previous_title": "Drill Default Input Format", 
                     "previous_url": "/docs/drill-default-input-format/", 
-                    "relative_path": "_docs/connect-a-data-source/090-mongo-plugin.md", 
+                    "relative_path": "_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md", 
                     "title": "MongoDB Plugin for Apache Drill", 
                     "url": "/docs/mongodb-plugin-for-apache-drill/"
                 }, 
@@ -1067,7 +1088,7 @@
                     "parent": "Connect a Data Source", 
                     "previous_title": "MongoDB Plugin for Apache Drill", 
                     "previous_url": "/docs/mongodb-plugin-for-apache-drill/", 
-                    "relative_path": "_docs/connect-a-data-source/100-mapr-db-plugin.md", 
+                    "relative_path": "_docs/connect-a-data-source/100-mapr-db-format.md", 
                     "title": "MapR-DB Format", 
                     "url": "/docs/mapr-db-format/"
                 }
@@ -2149,7 +2170,7 @@
             "parent": "Storage Plugin Configuration", 
             "previous_title": "Hive Storage Plugin", 
             "previous_url": "/docs/hive-storage-plugin/", 
-            "relative_path": "_docs/connect-a-data-source/080-default-frmt.md", 
+            "relative_path": "_docs/connect-a-data-source/080-drill-default-input-format.md", 
             "title": "Drill Default Input Format", 
             "url": "/docs/drill-default-input-format/"
         }, 
@@ -2347,7 +2368,7 @@
             "parent": "Storage Plugin Configuration", 
             "previous_title": "Workspaces", 
             "previous_url": "/docs/workspaces/", 
-            "relative_path": "_docs/connect-a-data-source/050-reg-fs.md", 
+            "relative_path": "_docs/connect-a-data-source/050-file-system-storage-plugin.md", 
             "title": "File System Storage Plugin", 
             "url": "/docs/file-system-storage-plugin/"
         }, 
@@ -2478,7 +2499,7 @@
             "parent": "Storage Plugin Configuration", 
             "previous_title": "File System Storage Plugin", 
             "previous_url": "/docs/file-system-storage-plugin/", 
-            "relative_path": "_docs/connect-a-data-source/060-reg-hbase.md", 
+            "relative_path": "_docs/connect-a-data-source/060-hbase-storage-plugin.md", 
             "title": "HBase Storage Plugin", 
             "url": "/docs/hbase-storage-plugin/"
         }, 
@@ -2520,7 +2541,7 @@
             "parent": "Storage Plugin Configuration", 
             "previous_title": "HBase Storage Plugin", 
             "previous_url": "/docs/hbase-storage-plugin/", 
-            "relative_path": "_docs/connect-a-data-source/070-reg-hive.md", 
+            "relative_path": "_docs/connect-a-data-source/070-hive-storage-plugin.md", 
             "title": "Hive Storage Plugin", 
             "url": "/docs/hive-storage-plugin/"
         }, 
@@ -3681,7 +3702,7 @@
             "parent": "Connect a Data Source", 
             "previous_title": "MongoDB Plugin for Apache Drill", 
             "previous_url": "/docs/mongodb-plugin-for-apache-drill/", 
-            "relative_path": "_docs/connect-a-data-source/100-mapr-db-plugin.md", 
+            "relative_path": "_docs/connect-a-data-source/100-mapr-db-format.md", 
             "title": "MapR-DB Format", 
             "url": "/docs/mapr-db-format/"
         }, 
@@ -3719,7 +3740,7 @@
             "parent": "Connect a Data Source", 
             "previous_title": "Drill Default Input Format", 
             "previous_url": "/docs/drill-default-input-format/", 
-            "relative_path": "_docs/connect-a-data-source/090-mongo-plugin.md", 
+            "relative_path": "_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md", 
             "title": "MongoDB Plugin for Apache Drill", 
             "url": "/docs/mongodb-plugin-for-apache-drill/"
         }, 
@@ -7237,11 +7258,32 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "File System Storage Plugin", 
-                    "next_url": "/docs/file-system-storage-plugin/", 
+                    "next_title": "Workspaces", 
+                    "next_url": "/docs/workspaces/", 
                     "parent": "Storage Plugin Configuration", 
                     "previous_title": "Storage Plugin Configuration", 
                     "previous_url": "/docs/storage-plugin-configuration/", 
+                    "relative_path": "_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md", 
+                    "title": "Storage Plugin Configuration Introduction", 
+                    "url": "/docs/storage-plugin-configuration-introduction/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Storage Plugin Configuration", 
+                            "url": "/docs/storage-plugin-configuration/"
+                        }, 
+                        {
+                            "title": "Connect a Data Source", 
+                            "url": "/docs/connect-a-data-source/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "File System Storage Plugin", 
+                    "next_url": "/docs/file-system-storage-plugin/", 
+                    "parent": "Storage Plugin Configuration", 
+                    "previous_title": "Storage Plugin Configuration Introduction", 
+                    "previous_url": "/docs/storage-plugin-configuration-introduction/", 
                     "relative_path": "_docs/connect-a-data-source/040-workspaces.md", 
                     "title": "Workspaces", 
                     "url": "/docs/workspaces/"
@@ -7263,7 +7305,7 @@
                     "parent": "Storage Plugin Configuration", 
                     "previous_title": "Workspaces", 
                     "previous_url": "/docs/workspaces/", 
-                    "relative_path": "_docs/connect-a-data-source/050-reg-fs.md", 
+                    "relative_path": "_docs/connect-a-data-source/050-file-system-storage-plugin.md", 
                     "title": "File System Storage Plugin", 
                     "url": "/docs/file-system-storage-plugin/"
                 }, 
@@ -7284,7 +7326,7 @@
                     "parent": "Storage Plugin Configuration", 
                     "previous_title": "File System Storage Plugin", 
                     "previous_url": "/docs/file-system-storage-plugin/", 
-                    "relative_path": "_docs/connect-a-data-source/060-reg-hbase.md", 
+                    "relative_path": "_docs/connect-a-data-source/060-hbase-storage-plugin.md", 
                     "title": "HBase Storage Plugin", 
                     "url": "/docs/hbase-storage-plugin/"
                 }, 
@@ -7305,7 +7347,7 @@
                     "parent": "Storage Plugin Configuration", 
                     "previous_title": "HBase Storage Plugin", 
                     "previous_url": "/docs/hbase-storage-plugin/", 
-                    "relative_path": "_docs/connect-a-data-source/070-reg-hive.md", 
+                    "relative_path": "_docs/connect-a-data-source/070-hive-storage-plugin.md", 
                     "title": "Hive Storage Plugin", 
                     "url": "/docs/hive-storage-plugin/"
                 }, 
@@ -7326,20 +7368,41 @@
                     "parent": "Storage Plugin Configuration", 
                     "previous_title": "Hive Storage Plugin", 
                     "previous_url": "/docs/hive-storage-plugin/", 
-                    "relative_path": "_docs/connect-a-data-source/080-default-frmt.md", 
+                    "relative_path": "_docs/connect-a-data-source/080-drill-default-input-format.md", 
                     "title": "Drill Default Input Format", 
                     "url": "/docs/drill-default-input-format/"
                 }
             ], 
-            "next_title": "Workspaces", 
-            "next_url": "/docs/workspaces/", 
+            "next_title": "Storage Plugin Configuration Introduction", 
+            "next_url": "/docs/storage-plugin-configuration-introduction/", 
             "parent": "Connect a Data Source", 
             "previous_title": "Storage Plugin Registration", 
             "previous_url": "/docs/storage-plugin-registration/", 
-            "relative_path": "_docs/connect-a-data-source/030-plugin-conf.md", 
+            "relative_path": "_docs/connect-a-data-source/030-storage-plugin-configuration.md", 
             "title": "Storage Plugin Configuration", 
             "url": "/docs/storage-plugin-configuration/"
         }, 
+        "Storage Plugin Configuration Introduction": {
+            "breadcrumbs": [
+                {
+                    "title": "Storage Plugin Configuration", 
+                    "url": "/docs/storage-plugin-configuration/"
+                }, 
+                {
+                    "title": "Connect a Data Source", 
+                    "url": "/docs/connect-a-data-source/"
+                }
+            ], 
+            "children": [], 
+            "next_title": "Workspaces", 
+            "next_url": "/docs/workspaces/", 
+            "parent": "Storage Plugin Configuration", 
+            "previous_title": "Storage Plugin Configuration", 
+            "previous_url": "/docs/storage-plugin-configuration/", 
+            "relative_path": "_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md", 
+            "title": "Storage Plugin Configuration Introduction", 
+            "url": "/docs/storage-plugin-configuration-introduction/"
+        }, 
         "Storage Plugin Registration": {
             "breadcrumbs": [
                 {
@@ -7353,7 +7416,7 @@
             "parent": "Connect a Data Source", 
             "previous_title": "Connect a Data Source Introduction", 
             "previous_url": "/docs/connect-a-data-source-introduction/", 
-            "relative_path": "_docs/connect-a-data-source/020-plugin-reg.md", 
+            "relative_path": "_docs/connect-a-data-source/020-storage-plugin-registration.md", 
             "title": "Storage Plugin Registration", 
             "url": "/docs/storage-plugin-registration/"
         }, 
@@ -8298,8 +8361,8 @@
             "next_title": "File System Storage Plugin", 
             "next_url": "/docs/file-system-storage-plugin/", 
             "parent": "Storage Plugin Configuration", 
-            "previous_title": "Storage Plugin Configuration", 
-            "previous_url": "/docs/storage-plugin-configuration/", 
+            "previous_title": "Storage Plugin Configuration Introduction", 
+            "previous_url": "/docs/storage-plugin-configuration-introduction/", 
             "relative_path": "_docs/connect-a-data-source/040-workspaces.md", 
             "title": "Workspaces", 
             "url": "/docs/workspaces/"
@@ -8905,7 +8968,7 @@
                     "parent": "Connect a Data Source", 
                     "previous_title": "Connect a Data Source Introduction", 
                     "previous_url": "/docs/connect-a-data-source-introduction/", 
-                    "relative_path": "_docs/connect-a-data-source/020-plugin-reg.md", 
+                    "relative_path": "_docs/connect-a-data-source/020-storage-plugin-registration.md", 
                     "title": "Storage Plugin Registration", 
                     "url": "/docs/storage-plugin-registration/"
                 }, 
@@ -8929,11 +8992,32 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "File System Storage Plugin", 
-                            "next_url": "/docs/file-system-storage-plugin/", 
+                            "next_title": "Workspaces", 
+                            "next_url": "/docs/workspaces/", 
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Storage Plugin Configuration", 
                             "previous_url": "/docs/storage-plugin-configuration/", 
+                            "relative_path": "_docs/connect-a-data-source/035-storage-plugin-configuration-introduction.md", 
+                            "title": "Storage Plugin Configuration Introduction", 
+                            "url": "/docs/storage-plugin-configuration-introduction/"
+                        }, 
+                        {
+                            "breadcrumbs": [
+                                {
+                                    "title": "Storage Plugin Configuration", 
+                                    "url": "/docs/storage-plugin-configuration/"
+                                }, 
+                                {
+                                    "title": "Connect a Data Source", 
+                                    "url": "/docs/connect-a-data-source/"
+                                }
+                            ], 
+                            "children": [], 
+                            "next_title": "File System Storage Plugin", 
+                            "next_url": "/docs/file-system-storage-plugin/", 
+                            "parent": "Storage Plugin Configuration", 
+                            "previous_title": "Storage Plugin Configuration Introduction", 
+                            "previous_url": "/docs/storage-plugin-configuration-introduction/", 
                             "relative_path": "_docs/connect-a-data-source/040-workspaces.md", 
                             "title": "Workspaces", 
                             "url": "/docs/workspaces/"
@@ -8955,7 +9039,7 @@
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Workspaces", 
                             "previous_url": "/docs/workspaces/", 
-                            "relative_path": "_docs/connect-a-data-source/050-reg-fs.md", 
+                            "relative_path": "_docs/connect-a-data-source/050-file-system-storage-plugin.md", 
                             "title": "File System Storage Plugin", 
                             "url": "/docs/file-system-storage-plugin/"
                         }, 
@@ -8976,7 +9060,7 @@
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "File System Storage Plugin", 
                             "previous_url": "/docs/file-system-storage-plugin/", 
-                            "relative_path": "_docs/connect-a-data-source/060-reg-hbase.md", 
+                            "relative_path": "_docs/connect-a-data-source/060-hbase-storage-plugin.md", 
                             "title": "HBase Storage Plugin", 
                             "url": "/docs/hbase-storage-plugin/"
                         }, 
@@ -8997,7 +9081,7 @@
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "HBase Storage Plugin", 
                             "previous_url": "/docs/hbase-storage-plugin/", 
-                            "relative_path": "_docs/connect-a-data-source/070-reg-hive.md", 
+                            "relative_path": "_docs/connect-a-data-source/070-hive-storage-plugin.md", 
                             "title": "Hive Storage Plugin", 
                             "url": "/docs/hive-storage-plugin/"
                         }, 
@@ -9018,17 +9102,17 @@
                             "parent": "Storage Plugin Configuration", 
                             "previous_title": "Hive Storage Plugin", 
                             "previous_url": "/docs/hive-storage-plugin/", 
-                            "relative_path": "_docs/connect-a-data-source/080-default-frmt.md", 
+                            "relative_path": "_docs/connect-a-data-source/080-drill-default-input-format.md", 
                             "title": "Drill Default Input Format", 
                             "url": "/docs/drill-default-input-format/"
                         }
                     ], 
-                    "next_title": "Workspaces", 
-                    "next_url": "/docs/workspaces/", 
+                    "next_title": "Storage Plugin Configuration Introduction", 
+                    "next_url": "/docs/storage-plugin-configuration-introduction/", 
                     "parent": "Connect a Data Source", 
                     "previous_title": "Storage Plugin Registration", 
                     "previous_url": "/docs/storage-plugin-registration/", 
-                    "relative_path": "_docs/connect-a-data-source/030-plugin-conf.md", 
+                    "relative_path": "_docs/connect-a-data-source/030-storage-plugin-configuration.md", 
                     "title": "Storage Plugin Configuration", 
                     "url": "/docs/storage-plugin-configuration/"
                 }, 
@@ -9045,7 +9129,7 @@
                     "parent": "Connect a Data Source", 
                     "previous_title": "Drill Default Input Format", 
                     "previous_url": "/docs/drill-default-input-format/", 
-                    "relative_path": "_docs/connect-a-data-source/090-mongo-plugin.md", 
+                    "relative_path": "_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md", 
                     "title": "MongoDB Plugin for Apache Drill", 
                     "url": "/docs/mongodb-plugin-for-apache-drill/"
                 }, 
@@ -9062,7 +9146,7 @@
                     "parent": "Connect a Data Source", 
                     "previous_title": "MongoDB Plugin for Apache Drill", 
                     "previous_url": "/docs/mongodb-plugin-for-apache-drill/", 
-                    "relative_path": "_docs/connect-a-data-source/100-mapr-db-plugin.md", 
+                    "relative_path": "_docs/connect-a-data-source/100-mapr-db-format.md", 
                     "title": "MapR-DB Format", 
                     "url": "/docs/mapr-db-format/"
                 }


[49/50] [abbrv] drill git commit: minor edit

Posted by ts...@apache.org.
minor edit


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

Branch: refs/heads/gh-pages
Commit: 2a81f84dc328e7a66727a38e8a09d360e63dd6fe
Parents: c974906
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 10:55:43 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 10:55:43 2015 -0700

----------------------------------------------------------------------
 _docs/manage-drill/017-configuring-a-shared-drillbit.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/2a81f84d/_docs/manage-drill/017-configuring-a-shared-drillbit.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/017-configuring-a-shared-drillbit.md b/_docs/manage-drill/017-configuring-a-shared-drillbit.md
index 7ffe0b7..ae9a8c7 100644
--- a/_docs/manage-drill/017-configuring-a-shared-drillbit.md
+++ b/_docs/manage-drill/017-configuring-a-shared-drillbit.md
@@ -2,7 +2,7 @@
 title: "Configuring Resources for a Shared Drillbit"
 parent: "Configuring Different Workloads"
 ---
-To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization.
+To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization in addition to memory.
 
 ##Configuring Drill Query Queuing
 


[14/50] [abbrv] drill git commit: Removing categories bar and placing responsive categories button near logo. Fixing up margins to look nicer at all widths

Posted by ts...@apache.org.
Removing categories bar and placing responsive categories button near
logo. Fixing up margins to look nicer at all widths


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

Branch: refs/heads/gh-pages
Commit: 3b66c466618cc1f5f92175d486e028eb0f499214
Parents: 1e80943
Author: Danny <dk...@batchblue.com>
Authored: Wed Apr 29 19:48:25 2015 -0400
Committer: Danny <dk...@batchblue.com>
Committed: Wed Apr 29 19:48:25 2015 -0400

----------------------------------------------------------------------
 _includes/doctoccategories.html |  3 --
 _includes/menu.html             |  5 ++-
 _layouts/docpage.html           | 12 ++----
 css/breadcrumbs.css             |  1 -
 css/docpage.css                 | 80 +++++++++++++++---------------------
 css/responsive.css              | 33 ++++++++++-----
 css/style.css                   |  7 ++--
 js/drill.js                     | 24 +++--------
 8 files changed, 72 insertions(+), 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/3b66c466/_includes/doctoccategories.html
----------------------------------------------------------------------
diff --git a/_includes/doctoccategories.html b/_includes/doctoccategories.html
index 2c371de..8b13789 100644
--- a/_includes/doctoccategories.html
+++ b/_includes/doctoccategories.html
@@ -1,4 +1 @@
-<div class='toc-categories'>
-  <span class="pull-left">Categories</span><span class="pull-right expand-toc-icon"><a href="javascript:void(0);">☰</a></span>
-</div>
 

http://git-wip-us.apache.org/repos/asf/drill/blob/3b66c466/_includes/menu.html
----------------------------------------------------------------------
diff --git a/_includes/menu.html b/_includes/menu.html
index dcfc3f5..71a7c01 100755
--- a/_includes/menu.html
+++ b/_includes/menu.html
@@ -2,12 +2,15 @@
 
 <div id="menu" class="mw">
 <ul>
+  <li class='toc-categories'>
+    <a class="expand-toc-icon" href="javascript:void(0);">☰</a>
+  </li>
   <li class="logo"><a href="{{ site.baseurl }}/"></a></li>
   <li class='expand-menu'>
     <a href="javascript:void(0);"><span class='menu-text'>Menu</span><span class='expand-icon'>☰</span></a>
   </li>
   <li class='clear-float'></li>
-  <li>
+  <li class="documentation-menu">
     <a href="{{ site.baseurl }}/docs/">Documentation</a>
     <ul>
       {% for doc in site.data.docs.hierarchy %}

http://git-wip-us.apache.org/repos/asf/drill/blob/3b66c466/_layouts/docpage.html
----------------------------------------------------------------------
diff --git a/_layouts/docpage.html b/_layouts/docpage.html
index a503f92..ba7da43 100644
--- a/_layouts/docpage.html
+++ b/_layouts/docpage.html
@@ -9,7 +9,6 @@ title: Documentation
 <body onResize="resized();">
 <div class="page-wrap">
   {% include menu.html %}
-  {% include doctoccategories.html %}
 
   {% include doctoc.html %}
 
@@ -28,7 +27,7 @@ title: Documentation
         <a class="edit-link" href="https://github.com/apache/drill/blob/gh-pages/{{ page.relative_path }}" target="_blank"><i class="fa fa-pencil-square-o"></i></a>
         {% if page_data.children.size == 0 %}
           {{ content }}
-        {% else %}
+      {% else %}
           <ul>
           {% for doc0 in page_data.children %}
             <li><a href="{{ site.baseurl }}{{ doc0.url }}">{{ doc0.title }}</a></li>
@@ -42,16 +41,13 @@ title: Documentation
         {% endfor %}
         </ul>
       {% endif %}
-      </div>
-
-      {% include docnav.html %}
 
+        {% include docnav.html %}
+      </div>
     </div>
-
-
   </div>
 
-      {% include footer.html %}
+  {% include footer.html %}
 </div>
 {% include scripts.html %}
 </body>

http://git-wip-us.apache.org/repos/asf/drill/blob/3b66c466/css/breadcrumbs.css
----------------------------------------------------------------------
diff --git a/css/breadcrumbs.css b/css/breadcrumbs.css
index bde9fdb..0f72e06 100644
--- a/css/breadcrumbs.css
+++ b/css/breadcrumbs.css
@@ -5,7 +5,6 @@
   overflow: hidden;
   margin-top: 55px;
   list-style: none;
-  border-bottom: solid 1px #E4E4E4;
   width: 100%;
 }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/3b66c466/css/docpage.css
----------------------------------------------------------------------
diff --git a/css/docpage.css b/css/docpage.css
index f28b055..e66ff6f 100644
--- a/css/docpage.css
+++ b/css/docpage.css
@@ -1,35 +1,21 @@
 /*****************
  Categories Bar
 *****************/
-
-div.toc-categories {
-  background-color: #ccc;
-  line-height: 48px;
+#menu ul li.toc-categories a {
+	height:50px;
+	padding:0;
+  text-decoration: none;
+	width: 60px;
+  text-align: center;
+  color: #bababa;
+}
+#menu ul li.toc-categories {
+	float:left;
+  line-height: 45px;
   font-size: 18px;
-  color: black;
   display: none;
   overflow: auto;
 }
-div.toc-categories .pull-left {
-  float: left;
-  margin-left: 10px;
-}
-
-div.toc-categories .pull-right {
-  float: right;
-  margin-right: 10px;
-}
-
-div.toc-categories a {
-  text-decoration: none;
-}
-
-div.toc-categories.fixed {
-  position:fixed;
-  z-index: 1;
-  width: 100%;
-  top: 50px;
-}
 
 /****************
  Docs Nav (Bottom)
@@ -63,17 +49,17 @@ div.doc-nav span.next-toc {
  Main Area
 *****************/
 
-.int_text {
+.main-content .int_text {
+  margin-left: 0px;
   margin-top:30px;
-  margin-left: 30px;
 }
 .main-content .int_text img {
   margin: 30px 0px;
 }
-.int_title
+.main-content .int_title
 {
-  margin-left: 30px;
   text-align: left;
+  margin-left: 0px;
   margin-top: 30px;
 }
 .int_title::after{
@@ -318,9 +304,9 @@ span.expand.show, span.contract.show {
 
 .docsidebarwrapper li.toctree-l2.current, .docsidebarwrapper li.toctree-l3.current {
   background-color: #1A6BC7;
+  color: white;
 }
-.docsidebarwrapper li.current a {
-  background-color: #1A6BC7;
+.docsidebarwrapper li.toctree-l2.current.current > a, .docsidebarwrapper li.toctree-l3.current.current > a {
   color: white;
 }
 .docsidebarwrapper a:hover {
@@ -372,21 +358,28 @@ span.expand.show, span.contract.show {
   #footer {
     margin-left: 0px;
   }
-  div.doc-nav {
-  }
 
-  div.toc-categories {
-    display: block;
+  #menu ul li.toc-categories {
+    display: inline-block;
+    width: 60px;
+    text-align: center;
   }
+  #menu ul li.logo {
+    padding-left: 0px;
+  }
+  #menu ul li.force-expand.toc-categories {
+    display: inline-block;
+  }
+
   .page-wrap div.int_title.margin_110 {
     margin-top:110px;
   }
 
-  div.toc-categories .expand-toc-icon {
+  li.toc-categories .expand-toc-icon {
     font-size: 24px;
     /*padding-right: 10px;*/
   }
-  div.toc-categories .expand-toc-icon a {
+  li.toc-categories a.expand-toc-icon {
     color: black;
   }
 
@@ -396,10 +389,6 @@ span.expand.show, span.contract.show {
     text-decoration: none;
   }
 
-  #menu ul li.logo {
-    /*padding-left: 70px; */
-  }
-
   .sidebar {
     left: -293px;
     box-shadow: 0 0 13px rgba(0,0,0,0.3);
@@ -410,10 +399,9 @@ span.expand.show, span.contract.show {
   }
 
   .main-content{
-    margin-left: 0;
+    margin: 0px 20px 0px 20px;
   }
   .int_title {
-    margin-left: 30px;
     margin-top: 60px;
   }
   .int_title h1 {
@@ -424,10 +412,6 @@ span.expand.show, span.contract.show {
   .main-content-wrapper {
     width: 1092px; 
   }
-  .main-content {
-
-  }
-
   div.doc-nav {
     margin-left: 30px;
   }
@@ -437,7 +421,7 @@ span.expand.show, span.contract.show {
   }
   .main-content
   {
-    margin-left: 293px;
+    margin-left: 313px;
   }
   #menu ul li.logo {
     padding-left: 30px;

http://git-wip-us.apache.org/repos/asf/drill/blob/3b66c466/css/responsive.css
----------------------------------------------------------------------
diff --git a/css/responsive.css b/css/responsive.css
index 49ee694..e1a842d 100644
--- a/css/responsive.css
+++ b/css/responsive.css
@@ -1,16 +1,12 @@
 nav.breadcrumbs{
-  margin-left: 0px;
+  margin-left: -8px;
 }
-.toc-categories {
+#menu ul li.toc-categories {
   display:none;
 }
-@media (max-width: 1393px) {
-    #menu ul li.logo {
-      padding-left: 30px;
-    }
-   #menu ul li.expand-menu {
-    display: none;
-  }
+
+#menu ul li.menu-break {
+  display:none;
 }
 
 /*@media (max-width: 768px) {
@@ -33,6 +29,13 @@ nav.breadcrumbs{
   .mw {
     min-width: 0px;
   }
+  #menu ul li.logo {
+    padding-left: 30px;
+  }
+   #menu ul li.expand-menu {
+    display: none;
+  }
+
   #menu ul li, #menu ul li.d{
     display: none;
   }
@@ -42,18 +45,22 @@ nav.breadcrumbs{
   .int_title {
     text-align: left;
     width: auto;
-    margin: 20px 20px 0px 10px;
+    margin: 80px 20px 0px 20px;
   }
   .int_title:after {
     left: 0px;
   }
   .int_text {
     width: auto;
-    margin: 60px 10px 100px 10px;
+    margin: 20px 10px 100px 20px;
   }
   #menu ul li.force-expand, #menu ul li.d.force-expand {
     display:inline-block;
   }
+
+  #menu ul li.force-expand.toc-categories {
+    display: none;
+  }
   #menu ul li.force-expand ul li{
     display:block;
   }
@@ -65,6 +72,10 @@ nav.breadcrumbs{
     display: block;
   }
   #menu ul li.expand-menu {
+    display: inline-block;
+    float: right;
+  }
+  #menu ul br.menu-break {
     display: block;
   }
   #menu ul li.expand-menu, #menu ul li.expand-menu a {

http://git-wip-us.apache.org/repos/asf/drill/blob/3b66c466/css/style.css
----------------------------------------------------------------------
diff --git a/css/style.css b/css/style.css
index 611145d..9e524e1 100755
--- a/css/style.css
+++ b/css/style.css
@@ -679,7 +679,7 @@ table.intro a {
 }
 
 .int_text {
-	margin:60px auto 60px auto;
+	margin:40px auto 60px auto;
 	width:780px;
 }
 
@@ -735,7 +735,7 @@ ul.num {
 	font-size:16px;
 	font-weight:lighter;
 	margin:auto;
-	margin-top:60px;
+	margin-top:80px;
 	padding:0 0 15px 0;
 	position:relative;
 	text-align:center;
@@ -768,7 +768,7 @@ ul.num {
 
 .int_title h1 {
 	font-size:36px;
-	margin:0;
+	margin: 20px 0px 20px 0px;
 }
 
 .int_title:after {
@@ -879,6 +879,7 @@ li p {
   font-weight: inherit;
   padding: 0 0 0 8px;
   line-height: 20px;
+  font-family: "Lato";
   width: 44px;
 }
 #menu .search-bar input[placeholder] {

http://git-wip-us.apache.org/repos/asf/drill/blob/3b66c466/js/drill.js
----------------------------------------------------------------------
diff --git a/js/drill.js b/js/drill.js
index 77725e3..914945a 100644
--- a/js/drill.js
+++ b/js/drill.js
@@ -19,7 +19,8 @@ Drill.Site = {
   },
 
   menuIsExpanded : function() {
-    var item_to_check = $($("#menu ul li")[3]).css("display");
+    // Note: depends on status of documentation-menu item to check menu visibility. May be a cleaner approach.
+    var item_to_check = $($("#menu ul li.documentation-menu")).css("display");
     return (item_to_check != 'none');
   },
 
@@ -91,7 +92,6 @@ Drill.Docs = {
     Drill.Docs.add_expand_contract_buttons();
     Drill.Docs.show_or_hide_on_click();
     Drill.Docs.setCurrentDoc();
-    Drill.Docs.watchCategoryBar();
     Drill.Docs.watchDocTocClicks();
     Drill.Docs.watchExpandTocClicks();
     Drill.Docs.permalinkSubHeaders();
@@ -121,22 +121,10 @@ Drill.Docs = {
     parent.children("span.contract").addClass('show');
   },
 
-  watchCategoryBar : function() {
-    $(window).scroll(function(){
-      var category_bar = $(".toc-categories");
-      if ($(this).scrollTop() > 35) {
-        category_bar.addClass('fixed');
-        $(".page-wrap div.int_title").addClass("margin_110");
-      } else {
-        category_bar.removeClass('fixed');
-        $(".page-wrap div.int_title").removeClass("margin_110");
-      }
-    });
-  },
-
   watchExpandTocClicks : function () {
     $(".expand-toc-icon").on("click", function(){
-      if($(".int_text .sidebar").css('left') == '0px'){
+      //  This relies on .sidebar's 'left' attribute...may be a cleaner approach
+      if($(".sidebar").css('left') == '0px'){
         Drill.Docs._contractSidebar();
       } else {
         Drill.Docs._expandSidebar();
@@ -221,11 +209,11 @@ Drill.Docs = {
   },
 
   _expandSidebar : function(){
-    $(".int_text .sidebar").addClass("force-expand");
+    $(".sidebar").addClass("force-expand");
   },
 
   _contractSidebar : function() {
-    $(".int_text .sidebar").removeClass("force-expand");
+    $(".sidebar").removeClass("force-expand");
   },
 
   _make_current : function(that) {


[22/50] [abbrv] drill git commit: format example

Posted by ts...@apache.org.
format example


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

Branch: refs/heads/gh-pages
Commit: a65a9f44234c790a0ccaae4e2233105fe375dcb9
Parents: 4b6f3dd
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 08:16:17 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 08:16:17 2015 -0700

----------------------------------------------------------------------
 .../060-hbase-storage-plugin.md                  | 19 ++++++++++---------
 .../017-how-multiple-users-share-a-drillbit.md   |  6 +++---
 2 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/a65a9f44/_docs/connect-a-data-source/060-hbase-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/060-hbase-storage-plugin.md b/_docs/connect-a-data-source/060-hbase-storage-plugin.md
index a8029df..acc12c1 100644
--- a/_docs/connect-a-data-source/060-hbase-storage-plugin.md
+++ b/_docs/connect-a-data-source/060-hbase-storage-plugin.md
@@ -17,15 +17,16 @@ To register HBase with Drill, complete the following steps:
   
 
      **Example**
-        {
-          "type": "hbase",
-          "config": {
-            "hbase.zookeeper.quorum": "10.10.100.62,10.10.10.52,10.10.10.53",
-            "hbase.zookeeper.property.clientPort": "2181"
-          },
-          "size.calculator.enabled": false,
-          "enabled": true
-        }
+     
+          {
+            "type": "hbase",
+            "config": {
+              "hbase.zookeeper.quorum": "10.10.100.62,10.10.10.52,10.10.10.53",
+              "hbase.zookeeper.property.clientPort": "2181"
+            },
+            "size.calculator.enabled": false,
+            "enabled": true
+          }
 
   4. Click **Enable**.
 

http://git-wip-us.apache.org/repos/asf/drill/blob/a65a9f44/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md b/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md
index 2cb24e5..b24aa4b 100644
--- a/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md
+++ b/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md
@@ -13,7 +13,7 @@ Set [options in sys.options]({{site.baseurl}}/docs/configuration-options-introdu
 
 ### Example Configuration
 
-For example, you configure the queue reserved for large queries to hold a 5-query maximum. You configure the queue reserved for small queue to hold 20 queries. Users start to run queries, and Drill receives the following query requests in this order:
+For example, you configure the queue reserved for large queries to hold a 5-query maximum. You configure the queue reserved for small queries to hold 20 queries. Users start to run queries, and Drill receives the following query requests in this order:
 
 * Query A (blue): 1 billion records, Drill estimates 10 million rows will be processed  
 * Query B (red): 2 billion records, Drill estimates 20 million rows will be processed  
@@ -24,7 +24,7 @@ The exec.queue.threshold default is 30 million, which is the estimated rows to b
 
 ![drill queuing]({{ site.baseurl }}/docs/img/queuing.png)
 
-The Drill queuing configuration in this example tends to give many users running small queries a rapid response. Users running a large query might experience some delay until an earlier-received large query returns.
+The Drill queuing configuration in this example tends to give many users running small queries a rapid response. Users running a large query might experience some delay until an earlier-received large query returns, freeing space in the large queue to process queries that are waiting.
 
 ## Controlling Parallelization
 
@@ -51,7 +51,7 @@ A parallelizer in the Foreman transforms the physical plan into multiple phases.
 
 ## Data Isolation
 
-Data isolation is typically a requirement for multiple users on a Drill cluster. By using row/column level security permissions ??link to doc?? in views, you can achieve data isolation.
+Tenants can share data on a cluster using Drill views and impersonation. ??Link to impersonation doc.??
 
 
 


[27/50] [abbrv] drill git commit: add links per NR

Posted by ts...@apache.org.
add links per NR


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

Branch: refs/heads/gh-pages
Commit: 456ee13a33211065b07cc7f97864186d7a8ca6ea
Parents: 26b0b39
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 08:43:41 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 08:43:41 2015 -0700

----------------------------------------------------------------------
 _docs/tutorials/010-tutorials-introduction.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/456ee13a/_docs/tutorials/010-tutorials-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/tutorials/010-tutorials-introduction.md b/_docs/tutorials/010-tutorials-introduction.md
index f9a4f79..1c74a39 100644
--- a/_docs/tutorials/010-tutorials-introduction.md
+++ b/_docs/tutorials/010-tutorials-introduction.md
@@ -15,5 +15,9 @@ If you've never used Drill, use these tutorials to download, install, and start
 * [Tableau Examples]({{site.baseurl}}/docs/tableau-examples)  
   Access Hive tables in Tableau.  
 * [Using MicroStrategy Analytics with Drill]({{site.baseurl}}/docs/using-microstrategy-analytics-with-drill/)  
-  Use the Drill ODBC driver from MapR to analyze data and generate a report using Drill from the MicroStrategy UI.
+  Use the Drill ODBC driver from MapR to analyze data and generate a report using Drill from the MicroStrategy UI.  
+* [Using Drill to Analyze Amazon Spot Prices](https://github.com/vicenteg/spot-price-history#drill-workshop---amazon-spot-prices)  
+  A Drill workshop on github that covers views of JSON and Parquet data.  
+* [Running Drill Queries on S3 Data](http://drill.apache.org/blog/2014/12/09/running-sql-queries-on-amazon-s3/)  
+  Nick Amato's blog that steps through querying files using Drill and Amazon Simple Storage Service (S3).  
 


[46/50] [abbrv] drill git commit: Automated alert bar on the home page to show 2 most recent blog posts

Posted by ts...@apache.org.
Automated alert bar on the home page to show 2 most recent blog posts


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

Branch: refs/heads/gh-pages
Commit: df9bd61840ce78c0eae35ddc4abf1611050ef368
Parents: 9531381
Author: Tomer Shiran <ts...@gmail.com>
Authored: Thu Apr 30 23:08:26 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Thu Apr 30 23:08:26 2015 -0700

----------------------------------------------------------------------
 index.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/df9bd618/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index a3351af..86def74 100755
--- a/index.html
+++ b/index.html
@@ -22,7 +22,12 @@ layout: default
 
 </div><!-- header -->
 <div class="alertbar">
-  <span class="strong">News:</span> <a href="{{ site.baseurl }}/blog/2015/03/31/drill-0.8-released/">Drill 0.8 Released</a> <span class="hor-bar"></span> <a href="{{ site.baseurl }}/blog/2015/03/23/microstrategy-announces-drill-support/">MicroStrategy Announces Drill Support</a>
+  <span class="strong">News:</span> 
+  {% assign post = site.categories.blog[0] %}<!-- previously: site.posts -->
+  <a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+  <span class="hor-bar"></span>
+  {% assign post = site.categories.blog[1] %}<!-- previously: site.posts -->
+  <a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
 </div>
 
 <div class="mw introWrapper">


[45/50] [abbrv] drill git commit: docs org

Posted by ts...@apache.org.
docs org


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

Branch: refs/heads/gh-pages
Commit: 953138153e6402eccb579e6bfe037f6be2447eea
Parents: 53a424a
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 19:04:45 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 19:04:45 2015 -0700

----------------------------------------------------------------------
 _data/docs.json                                 | 246 +++++--------------
 ...-configuring-drill-in-a-dedicated-cluster.md |  30 +++
 _docs/manage-drill/011-configuring-memory.md    |  30 ---
 ...nfiguring-dfferent-workloads-introduction.md |   4 +-
 .../015-configuring-drill-in-a-cluster.md       |  14 +-
 .../015-configuring-resources-in-a-cluster.md   |  78 ------
 ...nfiguring-resources-for-a-shared-drillbit.md |  65 -----
 7 files changed, 94 insertions(+), 373 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/95313815/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index 6cc9b8d..6805349 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -855,8 +855,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring Resources in a Cluster", 
-                    "next_url": "/docs/configuring-resources-in-a-cluster/", 
+                    "next_title": "Configuring Resources in a Mixed Cluster", 
+                    "next_url": "/docs/configuring-resources-in-a-mixed-cluster/", 
                     "parent": "Configuring Different Workloads", 
                     "previous_title": "Configuring Different Workloads", 
                     "previous_url": "/docs/configuring-different-workloads/", 
@@ -876,56 +876,14 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring Resources in a Cluster", 
-                    "next_url": "/docs/configuring-resources-in-a-cluster/", 
+                    "next_title": "Configuring Resources for a Shared Drillbit", 
+                    "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
                     "parent": "Configuring Different Workloads", 
                     "previous_title": "Configuring Different Workloads Introduction", 
                     "previous_url": "/docs/configuring-different-workloads-introduction/", 
                     "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md", 
-                    "title": "Configuring Resources in a Cluster", 
-                    "url": "/docs/configuring-resources-in-a-cluster/"
-                }, 
-                {
-                    "breadcrumbs": [
-                        {
-                            "title": "Configuring Different Workloads", 
-                            "url": "/docs/configuring-different-workloads/"
-                        }, 
-                        {
-                            "title": "Manage Drill", 
-                            "url": "/docs/manage-drill/"
-                        }
-                    ], 
-                    "children": [], 
-                    "next_title": "Configuring Resources for a Shared Drillbit", 
-                    "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
-                    "parent": "Configuring Different Workloads", 
-                    "previous_title": "Configuring Resources in a Cluster", 
-                    "previous_url": "/docs/configuring-resources-in-a-cluster/", 
-                    "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md", 
-                    "title": "Configuring Resources in a Cluster", 
-                    "url": "/docs/configuring-resources-in-a-cluster/"
-                }, 
-                {
-                    "breadcrumbs": [
-                        {
-                            "title": "Configuring Different Workloads", 
-                            "url": "/docs/configuring-different-workloads/"
-                        }, 
-                        {
-                            "title": "Manage Drill", 
-                            "url": "/docs/manage-drill/"
-                        }
-                    ], 
-                    "children": [], 
-                    "next_title": "Configuring Resources for a Shared Drillbit", 
-                    "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
-                    "parent": "Configuring Different Workloads", 
-                    "previous_title": "Configuring Resources in a Cluster", 
-                    "previous_url": "/docs/configuring-resources-in-a-cluster/", 
-                    "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
-                    "title": "Configuring Resources for a Shared Drillbit", 
-                    "url": "/docs/configuring-resources-for-a-shared-drillbit/"
+                    "title": "Configuring Resources in a Mixed Cluster", 
+                    "url": "/docs/configuring-resources-in-a-mixed-cluster/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -942,9 +900,9 @@
                     "next_title": "Configuration Options", 
                     "next_url": "/docs/configuration-options/", 
                     "parent": "Configuring Different Workloads", 
-                    "previous_title": "Configuring Resources for a Shared Drillbit", 
-                    "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
-                    "relative_path": "_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md", 
+                    "previous_title": "Configuring Resources in a Mixed Cluster", 
+                    "previous_url": "/docs/configuring-resources-in-a-mixed-cluster/", 
+                    "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
                     "title": "Configuring Resources for a Shared Drillbit", 
                     "url": "/docs/configuring-resources-for-a-shared-drillbit/"
                 }
@@ -952,8 +910,8 @@
             "next_title": "Configuring Different Workloads Introduction", 
             "next_url": "/docs/configuring-different-workloads-introduction/", 
             "parent": "Manage Drill", 
-            "previous_title": "Configuring Memory for Drill in a Drill cluster", 
-            "previous_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
+            "previous_title": "Configuring Drill in a Dedicated Cluster", 
+            "previous_url": "/docs/configuring-drill-in-a-dedicated-cluster/", 
             "relative_path": "_docs/manage-drill/012-configuring-different-workloads.md", 
             "title": "Configuring Different Workloads", 
             "url": "/docs/configuring-different-workloads/"
@@ -970,8 +928,8 @@
                 }
             ], 
             "children": [], 
-            "next_title": "Configuring Resources in a Cluster", 
-            "next_url": "/docs/configuring-resources-in-a-cluster/", 
+            "next_title": "Configuring Resources in a Mixed Cluster", 
+            "next_url": "/docs/configuring-resources-in-a-mixed-cluster/", 
             "parent": "Configuring Different Workloads", 
             "previous_title": "Configuring Different Workloads", 
             "previous_url": "/docs/configuring-different-workloads/", 
@@ -979,7 +937,7 @@
             "title": "Configuring Different Workloads Introduction", 
             "url": "/docs/configuring-different-workloads-introduction/"
         }, 
-        "Configuring Memory for Drill in a Drill cluster": {
+        "Configuring Drill in a Dedicated Cluster": {
             "breadcrumbs": [
                 {
                     "title": "Manage Drill", 
@@ -992,9 +950,9 @@
             "parent": "Manage Drill", 
             "previous_title": "Manage Drill Introduction", 
             "previous_url": "/docs/manage-drill-introduction/", 
-            "relative_path": "_docs/manage-drill/011-configuring-memory.md", 
-            "title": "Configuring Memory for Drill in a Drill cluster", 
-            "url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/"
+            "relative_path": "_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md", 
+            "title": "Configuring Drill in a Dedicated Cluster", 
+            "url": "/docs/configuring-drill-in-a-dedicated-cluster/"
         }, 
         "Configuring Resources for a Shared Drillbit": {
             "breadcrumbs": [
@@ -1011,13 +969,13 @@
             "next_title": "Configuration Options", 
             "next_url": "/docs/configuration-options/", 
             "parent": "Configuring Different Workloads", 
-            "previous_title": "Configuring Resources for a Shared Drillbit", 
-            "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
-            "relative_path": "_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md", 
+            "previous_title": "Configuring Resources in a Mixed Cluster", 
+            "previous_url": "/docs/configuring-resources-in-a-mixed-cluster/", 
+            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
             "title": "Configuring Resources for a Shared Drillbit", 
             "url": "/docs/configuring-resources-for-a-shared-drillbit/"
         }, 
-        "Configuring Resources in a Cluster": {
+        "Configuring Resources in a Mixed Cluster": {
             "breadcrumbs": [
                 {
                     "title": "Configuring Different Workloads", 
@@ -1032,11 +990,11 @@
             "next_title": "Configuring Resources for a Shared Drillbit", 
             "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
             "parent": "Configuring Different Workloads", 
-            "previous_title": "Configuring Resources in a Cluster", 
-            "previous_url": "/docs/configuring-resources-in-a-cluster/", 
-            "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md", 
-            "title": "Configuring Resources in a Cluster", 
-            "url": "/docs/configuring-resources-in-a-cluster/"
+            "previous_title": "Configuring Different Workloads Introduction", 
+            "previous_url": "/docs/configuring-different-workloads-introduction/", 
+            "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md", 
+            "title": "Configuring Resources in a Mixed Cluster", 
+            "url": "/docs/configuring-resources-in-a-mixed-cluster/"
         }, 
         "Connect a Data Source": {
             "breadcrumbs": [], 
@@ -3500,8 +3458,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring Memory for Drill in a Drill cluster", 
-                    "next_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
+                    "next_title": "Configuring Drill in a Dedicated Cluster", 
+                    "next_url": "/docs/configuring-drill-in-a-dedicated-cluster/", 
                     "parent": "Manage Drill", 
                     "previous_title": "Manage Drill", 
                     "previous_url": "/docs/manage-drill/", 
@@ -3522,9 +3480,9 @@
                     "parent": "Manage Drill", 
                     "previous_title": "Manage Drill Introduction", 
                     "previous_url": "/docs/manage-drill-introduction/", 
-                    "relative_path": "_docs/manage-drill/011-configuring-memory.md", 
-                    "title": "Configuring Memory for Drill in a Drill cluster", 
-                    "url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/"
+                    "relative_path": "_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md", 
+                    "title": "Configuring Drill in a Dedicated Cluster", 
+                    "url": "/docs/configuring-drill-in-a-dedicated-cluster/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -3546,8 +3504,8 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring Resources in a Cluster", 
-                            "next_url": "/docs/configuring-resources-in-a-cluster/", 
+                            "next_title": "Configuring Resources in a Mixed Cluster", 
+                            "next_url": "/docs/configuring-resources-in-a-mixed-cluster/", 
                             "parent": "Configuring Different Workloads", 
                             "previous_title": "Configuring Different Workloads", 
                             "previous_url": "/docs/configuring-different-workloads/", 
@@ -3567,56 +3525,14 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring Resources in a Cluster", 
-                            "next_url": "/docs/configuring-resources-in-a-cluster/", 
+                            "next_title": "Configuring Resources for a Shared Drillbit", 
+                            "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
                             "parent": "Configuring Different Workloads", 
                             "previous_title": "Configuring Different Workloads Introduction", 
                             "previous_url": "/docs/configuring-different-workloads-introduction/", 
                             "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md", 
-                            "title": "Configuring Resources in a Cluster", 
-                            "url": "/docs/configuring-resources-in-a-cluster/"
-                        }, 
-                        {
-                            "breadcrumbs": [
-                                {
-                                    "title": "Configuring Different Workloads", 
-                                    "url": "/docs/configuring-different-workloads/"
-                                }, 
-                                {
-                                    "title": "Manage Drill", 
-                                    "url": "/docs/manage-drill/"
-                                }
-                            ], 
-                            "children": [], 
-                            "next_title": "Configuring Resources for a Shared Drillbit", 
-                            "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
-                            "parent": "Configuring Different Workloads", 
-                            "previous_title": "Configuring Resources in a Cluster", 
-                            "previous_url": "/docs/configuring-resources-in-a-cluster/", 
-                            "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md", 
-                            "title": "Configuring Resources in a Cluster", 
-                            "url": "/docs/configuring-resources-in-a-cluster/"
-                        }, 
-                        {
-                            "breadcrumbs": [
-                                {
-                                    "title": "Configuring Different Workloads", 
-                                    "url": "/docs/configuring-different-workloads/"
-                                }, 
-                                {
-                                    "title": "Manage Drill", 
-                                    "url": "/docs/manage-drill/"
-                                }
-                            ], 
-                            "children": [], 
-                            "next_title": "Configuring Resources for a Shared Drillbit", 
-                            "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
-                            "parent": "Configuring Different Workloads", 
-                            "previous_title": "Configuring Resources in a Cluster", 
-                            "previous_url": "/docs/configuring-resources-in-a-cluster/", 
-                            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
-                            "title": "Configuring Resources for a Shared Drillbit", 
-                            "url": "/docs/configuring-resources-for-a-shared-drillbit/"
+                            "title": "Configuring Resources in a Mixed Cluster", 
+                            "url": "/docs/configuring-resources-in-a-mixed-cluster/"
                         }, 
                         {
                             "breadcrumbs": [
@@ -3633,9 +3549,9 @@
                             "next_title": "Configuration Options", 
                             "next_url": "/docs/configuration-options/", 
                             "parent": "Configuring Different Workloads", 
-                            "previous_title": "Configuring Resources for a Shared Drillbit", 
-                            "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
-                            "relative_path": "_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md", 
+                            "previous_title": "Configuring Resources in a Mixed Cluster", 
+                            "previous_url": "/docs/configuring-resources-in-a-mixed-cluster/", 
+                            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
                             "title": "Configuring Resources for a Shared Drillbit", 
                             "url": "/docs/configuring-resources-for-a-shared-drillbit/"
                         }
@@ -3643,8 +3559,8 @@
                     "next_title": "Configuring Different Workloads Introduction", 
                     "next_url": "/docs/configuring-different-workloads-introduction/", 
                     "parent": "Manage Drill", 
-                    "previous_title": "Configuring Memory for Drill in a Drill cluster", 
-                    "previous_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
+                    "previous_title": "Configuring Drill in a Dedicated Cluster", 
+                    "previous_url": "/docs/configuring-drill-in-a-dedicated-cluster/", 
                     "relative_path": "_docs/manage-drill/012-configuring-different-workloads.md", 
                     "title": "Configuring Different Workloads", 
                     "url": "/docs/configuring-different-workloads/"
@@ -3837,8 +3753,8 @@
                 }
             ], 
             "children": [], 
-            "next_title": "Configuring Memory for Drill in a Drill cluster", 
-            "next_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
+            "next_title": "Configuring Drill in a Dedicated Cluster", 
+            "next_url": "/docs/configuring-drill-in-a-dedicated-cluster/", 
             "parent": "Manage Drill", 
             "previous_title": "Manage Drill", 
             "previous_url": "/docs/manage-drill/", 
@@ -10970,8 +10886,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring Memory for Drill in a Drill cluster", 
-                    "next_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
+                    "next_title": "Configuring Drill in a Dedicated Cluster", 
+                    "next_url": "/docs/configuring-drill-in-a-dedicated-cluster/", 
                     "parent": "Manage Drill", 
                     "previous_title": "Manage Drill", 
                     "previous_url": "/docs/manage-drill/", 
@@ -10992,9 +10908,9 @@
                     "parent": "Manage Drill", 
                     "previous_title": "Manage Drill Introduction", 
                     "previous_url": "/docs/manage-drill-introduction/", 
-                    "relative_path": "_docs/manage-drill/011-configuring-memory.md", 
-                    "title": "Configuring Memory for Drill in a Drill cluster", 
-                    "url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/"
+                    "relative_path": "_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md", 
+                    "title": "Configuring Drill in a Dedicated Cluster", 
+                    "url": "/docs/configuring-drill-in-a-dedicated-cluster/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -11016,8 +10932,8 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring Resources in a Cluster", 
-                            "next_url": "/docs/configuring-resources-in-a-cluster/", 
+                            "next_title": "Configuring Resources in a Mixed Cluster", 
+                            "next_url": "/docs/configuring-resources-in-a-mixed-cluster/", 
                             "parent": "Configuring Different Workloads", 
                             "previous_title": "Configuring Different Workloads", 
                             "previous_url": "/docs/configuring-different-workloads/", 
@@ -11037,56 +10953,14 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring Resources in a Cluster", 
-                            "next_url": "/docs/configuring-resources-in-a-cluster/", 
+                            "next_title": "Configuring Resources for a Shared Drillbit", 
+                            "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
                             "parent": "Configuring Different Workloads", 
                             "previous_title": "Configuring Different Workloads Introduction", 
                             "previous_url": "/docs/configuring-different-workloads-introduction/", 
                             "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md", 
-                            "title": "Configuring Resources in a Cluster", 
-                            "url": "/docs/configuring-resources-in-a-cluster/"
-                        }, 
-                        {
-                            "breadcrumbs": [
-                                {
-                                    "title": "Configuring Different Workloads", 
-                                    "url": "/docs/configuring-different-workloads/"
-                                }, 
-                                {
-                                    "title": "Manage Drill", 
-                                    "url": "/docs/manage-drill/"
-                                }
-                            ], 
-                            "children": [], 
-                            "next_title": "Configuring Resources for a Shared Drillbit", 
-                            "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
-                            "parent": "Configuring Different Workloads", 
-                            "previous_title": "Configuring Resources in a Cluster", 
-                            "previous_url": "/docs/configuring-resources-in-a-cluster/", 
-                            "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md", 
-                            "title": "Configuring Resources in a Cluster", 
-                            "url": "/docs/configuring-resources-in-a-cluster/"
-                        }, 
-                        {
-                            "breadcrumbs": [
-                                {
-                                    "title": "Configuring Different Workloads", 
-                                    "url": "/docs/configuring-different-workloads/"
-                                }, 
-                                {
-                                    "title": "Manage Drill", 
-                                    "url": "/docs/manage-drill/"
-                                }
-                            ], 
-                            "children": [], 
-                            "next_title": "Configuring Resources for a Shared Drillbit", 
-                            "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
-                            "parent": "Configuring Different Workloads", 
-                            "previous_title": "Configuring Resources in a Cluster", 
-                            "previous_url": "/docs/configuring-resources-in-a-cluster/", 
-                            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
-                            "title": "Configuring Resources for a Shared Drillbit", 
-                            "url": "/docs/configuring-resources-for-a-shared-drillbit/"
+                            "title": "Configuring Resources in a Mixed Cluster", 
+                            "url": "/docs/configuring-resources-in-a-mixed-cluster/"
                         }, 
                         {
                             "breadcrumbs": [
@@ -11103,9 +10977,9 @@
                             "next_title": "Configuration Options", 
                             "next_url": "/docs/configuration-options/", 
                             "parent": "Configuring Different Workloads", 
-                            "previous_title": "Configuring Resources for a Shared Drillbit", 
-                            "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
-                            "relative_path": "_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md", 
+                            "previous_title": "Configuring Resources in a Mixed Cluster", 
+                            "previous_url": "/docs/configuring-resources-in-a-mixed-cluster/", 
+                            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
                             "title": "Configuring Resources for a Shared Drillbit", 
                             "url": "/docs/configuring-resources-for-a-shared-drillbit/"
                         }
@@ -11113,8 +10987,8 @@
                     "next_title": "Configuring Different Workloads Introduction", 
                     "next_url": "/docs/configuring-different-workloads-introduction/", 
                     "parent": "Manage Drill", 
-                    "previous_title": "Configuring Memory for Drill in a Drill cluster", 
-                    "previous_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
+                    "previous_title": "Configuring Drill in a Dedicated Cluster", 
+                    "previous_url": "/docs/configuring-drill-in-a-dedicated-cluster/", 
                     "relative_path": "_docs/manage-drill/012-configuring-different-workloads.md", 
                     "title": "Configuring Different Workloads", 
                     "url": "/docs/configuring-different-workloads/"

http://git-wip-us.apache.org/repos/asf/drill/blob/95313815/_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md b/_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md
new file mode 100644
index 0000000..7a3fc3f
--- /dev/null
+++ b/_docs/manage-drill/011-configuring-drill-in-a-dedicated-cluster.md
@@ -0,0 +1,30 @@
+---
+title: "Configuring Drill in a Dedicated Cluster"
+parent: "Manage Drill"
+---
+
+This section describes how to configure the amount of direct memory allocated to a Drillbit for query processing in a dedicated Drill cluster. When you use Drill in a cluster with other workloads, configure memory as described in section, ["Configuring Resources in a Mixed Cluster"]({{site.baseurl}}/docs/configuring-resources-in-a-cluster). 
+
+The default memory for a Drillbit is 8G, but Drill prefers 16G or more
+depending on the workload. The total amount of direct memory that a Drillbit
+allocates to query operations cannot exceed the limit set.
+
+Drill mainly uses Java direct memory and performs well when executing
+operations in memory instead of storing the operations on disk. Drill does not
+write to disk unless absolutely necessary, unlike MapReduce where everything
+is written to disk during each phase of a job.
+
+The JVM’s heap memory does not limit the amount of direct memory available in
+a Drillbit. The on-heap memory for Drill is only about 4-8G, which should
+suffice because Drill avoids having data sit in heap memory.
+
+## Modifying Drillbit Memory
+
+You can modify memory for each Drillbit node in your cluster. To modify the
+memory for a Drillbit, edit the `XX:MaxDirectMemorySize` parameter in the
+Drillbit startup script located in `<drill_installation_directory>/conf/drill-
+env.sh`.
+
+{% include startnote.html %}If this parameter is not set, the limit depends on the amount of available system memory.{% include endnote.html %}
+
+After you edit `<drill_installation_directory>/conf/drill-env.sh`, [restart the Drillbit]({{ site.baseurl }}/docs/starting-stopping-drill#starting-a-drillbit) onthe node.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/95313815/_docs/manage-drill/011-configuring-memory.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/011-configuring-memory.md b/_docs/manage-drill/011-configuring-memory.md
deleted file mode 100644
index f1921d3..0000000
--- a/_docs/manage-drill/011-configuring-memory.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: "Configuring Memory for Drill in a Drill cluster"
-parent: "Manage Drill"
----
-
-This section describes how to configure the amount of direct memory allocated to a Drillbit for query processing in a dedicated Drill cluster. When you use Drill in a cluster with other workloads, configure memory as described in section, ["Configuring Resources in a Cluster"]({{site.baseurl}}/docs/configuring-resources-in-a-cluster). 
-
-The default memory for a Drillbit is 8G, but Drill prefers 16G or more
-depending on the workload. The total amount of direct memory that a Drillbit
-allocates to query operations cannot exceed the limit set.
-
-Drill mainly uses Java direct memory and performs well when executing
-operations in memory instead of storing the operations on disk. Drill does not
-write to disk unless absolutely necessary, unlike MapReduce where everything
-is written to disk during each phase of a job.
-
-The JVM’s heap memory does not limit the amount of direct memory available in
-a Drillbit. The on-heap memory for Drill is only about 4-8G, which should
-suffice because Drill avoids having data sit in heap memory.
-
-## Modifying Drillbit Memory
-
-You can modify memory for each Drillbit node in your cluster. To modify the
-memory for a Drillbit, edit the `XX:MaxDirectMemorySize` parameter in the
-Drillbit startup script located in `<drill_installation_directory>/conf/drill-
-env.sh`.
-
-{% include startnote.html %}If this parameter is not set, the limit depends on the amount of available system memory.{% include endnote.html %}
-
-After you edit `<drill_installation_directory>/conf/drill-env.sh`, [restart the Drillbit]({{ site.baseurl }}/docs/starting-stopping-drill#starting-a-drillbit) onthe node.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/95313815/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
index ce1f1a6..9558039 100644
--- a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
+++ b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
@@ -15,8 +15,8 @@ Drill typically runs along side other workloads, including the following:
 
 You need to plan and configure these resources for use with Drill and other workloads: 
 
-* [Memory]({{site.baseurl}}/docs/configuring-resources-in-a-cluster)  
+* [Memory]({{site.baseurl}}/docs/configuring-resources-in-a-mixed-cluster)  
 * [CPU]({{site.baseurl}}/docs/configuring-drill-in-a-cluster#how-to-manage-drill-cpu-resources)  
 * Disk  
 
-["How to Run Drill in a Cluster"]({{site.baseurl}}/docs/how-to-run-drill-in-a-cluster) covers configuration for sharing a drillbit and ["How Multiple Users Share a Drillbit"]({{site.baseurl}}/docs/how-multiple-users-share-a-drillbit) covers configuration for Drillbits running on different nodes in the cluster.
\ No newline at end of file
+Configure, memory, queues, and parallelization ["when users share a Drillbit"]({{site.baseurl}}/docs/configuring-resources-for-a-shared-drillbit) covers configuration for Drillbits running on different nodes in the cluster.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/95313815/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
index 4ec1cf4..a5c124b 100644
--- a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
+++ b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
@@ -1,10 +1,10 @@
 ---
-title: "Configuring Resources in a Cluster"
+title: "Configuring Resources in a Mixed Cluster"
 parent: "Configuring Different Workloads"
 ---
 Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designate which partition handles which workload. 
 
-## Configuring Drill Memory in a Cluster with other Workloads
+## Configuring Drill Memory in a Mixed Cluster
 
 To configure memory resources for Drill, you modify the `warden.drill-bits.conf` file in `/opt/mapr/conf/conf.d`. This file is created automatically when you install Drill on a node. 
 
@@ -65,16 +65,6 @@ You configure memory for each service by setting three values in `warden.conf`.
     service.command.<servicename>.heapsize.max
     service.command.<servicename>.heapsize.min
 
-### Drill Memory
-You can configure the amount of direct memory allocated to a Drillbit for
-query processing, as described in the section, ["Configuring Memory"](({{site.baseurl}}/docs/configuring-memory).
-
-### Memory in a MapR Cluster
-Memory and disk for Drill and other services that are not associated with roles on a MapR cluster are shared with other services. You manage the chunk of memory for these services in os heap settings in `warden.conf` and in configuration files of the particular service. The warden os heap settings are:
-
-    service.command.os.heapsize.percent
-    service.command.os.heapsize.max
-    service.command.os.heapsize.min
 
 For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
 * [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)

http://git-wip-us.apache.org/repos/asf/drill/blob/95313815/_docs/manage-drill/015-configuring-resources-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-resources-in-a-cluster.md b/_docs/manage-drill/015-configuring-resources-in-a-cluster.md
deleted file mode 100644
index 7995278..0000000
--- a/_docs/manage-drill/015-configuring-resources-in-a-cluster.md
+++ /dev/null
@@ -1,78 +0,0 @@
----
-title: "Configuring Resources in a Cluster"
-parent: "Configuring Different Workloads"
----
-Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designate which partition handles which workload. 
-
-To reserve memory resources for Drill, you modify the `warden.drill-bits.conf` file in `/opt/mapr/conf/conf.d`. This file is created automatically when you install Drill on a node. 
-
-    [root@centos23 conf.d]# pwd
-    /opt/mapr/conf/conf.d
-    [root@centos23 conf.d]# ls
-    warden.drill-bits.conf  warden.nodemanager.conf  warden.resourcemanager.conf
-
-You add the following lines to the file:
-
-    service.heapsize.min=<some value in MB>
-    service.heapsize.max=<some value in MB>
-    service.heapsize.percent=<some whole number value>
-
-## Configuring Drill in a YARN-enabled MapR Cluster
-
-For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
-
-File system = 20G  
-HBase = 20G  
-Yarn = 20G  
-OS = 8G  
-
-To add Drill to the cluster, how do you change memory allocation? It depends on your application. If Yarn does most of the work, give Drill 20G, for example, and give Yarn 60G. If you expect a heavy query load, give Drill 60G and Drill 20G.
-
-{% include startnote.html %}Drill will execute queries within Yarn soon.{% include endnote.html %} [DRILL-142](https://issues.apache.org/jira/browse/DRILL-142)
-
-<!-- YARN consists of 2 main services ResourceManager(one instance in cluster, more if HA is configured) and NodeManager(one instance per node). See mr1.memory.percent, mr1.cpu.percent and 
-mr1.disk.percent in warden.conf. Rest is given to YARN applications.
-Also see /opt/mapr/conf/conf.d/warden.resourcemanager.conf and
- /opt/mapr/conf/conf.d/warden.nodemanager.conf for resources given to ResourceManager and NodeManager respectively.
-
-## Configuring Drill in a MapReduce V1-enabled cluster
-
-Similar files exist for other installed services, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf). For example:
-## What are the memory/resource configurations set in warden in a non-YARN cluster? 
-
-Every service will have 3 values defined in warden.conf (/opt/mapr/conf)
-service.command.<servicename>.heapsize.percent
-service.command.<servicename>.heapsize.max
-service.command.<servicename>.heapsize.min
-This is percentage of memory for that service bounded by min and max values.
-
-There will also be additional files in /opt/mapr/conf/conf.d in format 
-warden.<servicename>.conf. They will have entries like
-service.heapsize.min
-service.heapsize.max
-service.heapsize.percent -->
-
-## Managing Memory
-
-To run Drill in a cluster with MapReduce, HBase, Spark, and other workloads, manage memory according to your application needs. 
-
-To run Drill in a MapR cluster, allocate memory by configuring settings in warden.conf, as described in the [MapR documentation]().
-
-### Drill Memory
-You can configure the amount of direct memory allocated to a Drillbit for
-query processing, as described in the section, ["Configuring Memory"](({{site.baseurl}}/docs/configuring-memory).
-
-### Memory in a MapR Cluster
-Memory and disk for Drill and other services that are not associated with roles on a MapR cluster are shared with other services. You manage the chunk of memory for these services in os heap settings in `warden.conf` and in configuration files of the particular service. The warden os heap settings are:
-
-    service.command.os.heapsize.percent
-    service.command.os.heapsize.max
-    service.command.os.heapsize.min
-
-For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
-* [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)
-* [Cluster Resource Allocation](http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation)
-* [Customizing Memory Settings for MapReduce v1](http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1)
-
-## How to Manage Drill CPU Resources
-Currently, you do not manage CPU resources within Drill. [Use Linux `cgroups`](http://en.wikipedia.org/wiki/Cgroups) to manage the CPU resources.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/95313815/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md b/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md
deleted file mode 100644
index 7ffe0b7..0000000
--- a/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-title: "Configuring Resources for a Shared Drillbit"
-parent: "Configuring Different Workloads"
----
-To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization.
-
-##Configuring Drill Query Queuing
-
-Set [options in sys.options]({{site.baseurl}}/docs/configuration-options-introduction/) to enable and manage query queuing, which is turned off by default. There are two types of queues: large and small. You configure a maximum number of queries that each queue allows by configuring the following options in the `sys.options` table:
-
-* exec.queue.large  
-* exec.queue.small  
-
-### Example Configuration
-
-For example, you configure the queue reserved for large queries to hold a 5-query maximum. You configure the queue reserved for small queries to hold 20 queries. Users start to run queries, and Drill receives the following query requests in this order:
-
-* Query A (blue): 1 billion records, Drill estimates 10 million rows will be processed  
-* Query B (red): 2 billion records, Drill estimates 20 million rows will be processed  
-* Query C: 1 billion records  
-* Query D: 100 records
-
-The exec.queue.threshold default is 30 million, which is the estimated rows to be processed by the query. Queries A and B are queued in the large queue. The estimated rows to be processed reaches the 30 million threshold, filling the queue to capacity. The query C request arrives and goes on the wait list, and then query D arrives. Query D is queued immediately in the small queue because of its small size, as shown in the following diagram: 
-
-![drill queuing]({{ site.baseurl }}/docs/img/queuing.png)
-
-The Drill queuing configuration in this example tends to give many users running small queries a rapid response. Users running a large query might experience some delay until an earlier-received large query returns, freeing space in the large queue to process queries that are waiting.
-
-## Controlling Parallelization
-
-By default, Drill parallelizes operations when number of records manipulated within a fragment reaches 100,000. When parallelization of operations is high, the cluster operates as fast as possible, which is fine for a single user. In a contentious multi-tenant situation, however, you need to reduce parallelization to levels based on user needs.
-
-### Parallelization Configuration Procedure
-
-To configure parallelization, configure the following options in the `sys.options` table:
-
-* `planner.width.max.per.node`  
-  The maximum degree of distribution of a query across cores and cluster nodes.
-* `planner.width.max.per.query`  
-  Same as max per node but applies to the query as executed by the entire cluster.
-
-Configure the `planner.width.max.per.node` to achieve fine grained, absolute control over parallelization. 
-
-<!-- ??For example, setting the `planner.width.max.per.query` to 60 will not accelerate Drill operations because overlapping does not occur when executing 60 queries at the same time.??
-
-### Example of Configuring Parallelization
-
-For example, the default settings parallelize 70 percent of operations up to 1,000 cores. If you have 30 cores per node in a 10-node cluster, or 300 cores, parallelization occurs on approximately 210 cores. Consequently, a single user can get 70 percent usage from a cluster and no more due to the constraints configured by the `planner.width.max.per.query`.
-
-A parallelizer in the Foreman transforms the physical plan into multiple phases. A complicated query can have multiple, major fragments. A default parallelization of 70 percent of operations allows some overlap of query phases. In the example, 210 ??for each core or major fragment to a maximum of 410??.
-
-??Drill uses pipelines, blocking/nonblocking, memory is not fungible. CPU resources are fungible. There is contention for CPUs.?? -->
-
-## Data Isolation
-
-Tenants can share data on a cluster using Drill views and impersonation. ??Link to impersonation doc.??
-
-
-
-
-
-
-
-
-


[36/50] [abbrv] drill git commit: Search page

Posted by ts...@apache.org.
Search page


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

Branch: refs/heads/gh-pages
Commit: c4a4fd1e62e492a8932891ac5aaae218edcd0e8b
Parents: a4264b9
Author: Tomer Shiran <ts...@gmail.com>
Authored: Thu Apr 30 16:41:49 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Thu Apr 30 16:41:49 2015 -0700

----------------------------------------------------------------------
 _includes/menu.html |  1 -
 css/search.css      |  9 +++++++++
 css/style.css       | 26 --------------------------
 js/drill.js         | 21 ++++++++++++++++-----
 js/script.js        | 45 +++++----------------------------------------
 search.html         | 20 ++++++++++++++++++++
 6 files changed, 50 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/c4a4fd1e/_includes/menu.html
----------------------------------------------------------------------
diff --git a/_includes/menu.html b/_includes/menu.html
index 71a7c01..01f111e 100755
--- a/_includes/menu.html
+++ b/_includes/menu.html
@@ -39,7 +39,6 @@
         <i class="fa fa-search"></i>
       </button>
     </form>
-    <form target="_blank" id="search-using-google"></form>
   </li>
   <li class="d">
     <a href="{{ site.baseurl }}/download/">

http://git-wip-us.apache.org/repos/asf/drill/blob/c4a4fd1e/css/search.css
----------------------------------------------------------------------
diff --git a/css/search.css b/css/search.css
new file mode 100644
index 0000000..64d25c8
--- /dev/null
+++ b/css/search.css
@@ -0,0 +1,9 @@
+.int_search {
+  margin:50px auto 0 auto;
+  width:780px;
+  font-family: 'PT Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+
+.int_search .gsc-control-cse, .int_search .gsc-control-cse .gsc-table-result {
+  font-family: 'PT Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/c4a4fd1e/css/style.css
----------------------------------------------------------------------
diff --git a/css/style.css b/css/style.css
index 8ec44af..63cd695 100755
--- a/css/style.css
+++ b/css/style.css
@@ -247,32 +247,6 @@ a.anchor {
 	background-image:url(../images/familiarity-w.png);
 }
 
-
-#search {
-	background:#145aa8;
-	display:none;
-	left:0px;
-	right:0px;
-	padding:30px;
-	position:fixed;	
-	top:50px;
-	z-index:5;
-}
-
-#search.r {
-	position:absolute;
-	width:779px;	
-}
-
-#search input {
-	background:transparent;
-	border:none;
-	color:#FFF;
-	font-size:34px;
-	font-weight:lighter;
-	width:100%;
-}
-
 #header {
 	background:url(../images/reel-bg.png) no-repeat;
 	background-size:cover;

http://git-wip-us.apache.org/repos/asf/drill/blob/c4a4fd1e/js/drill.js
----------------------------------------------------------------------
diff --git a/js/drill.js b/js/drill.js
index 8e808db..c3da037 100644
--- a/js/drill.js
+++ b/js/drill.js
@@ -1,3 +1,5 @@
+---
+---
 var Drill = Drill || {};
 
 Drill.Site = {
@@ -6,6 +8,18 @@ Drill.Site = {
     Drill.Site.watchInternalAnchorClicks();
     Drill.Site.watchSearchBarMouseEnter();
     Drill.Site.watchSearchSubmit();
+    Drill.Site.setSearchVal();
+  },
+  
+  getParameterByName : function(name) {
+      name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+      var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+          results = regex.exec(location.search);
+      return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
+  },
+  
+  setSearchVal : function() {
+    $("#drill-search-term").val(Drill.Site.getParameterByName('q'));
   },
 
   watchExpandMenuClicks : function(){
@@ -47,11 +61,8 @@ Drill.Site = {
     $("#menu .search-bar #drill-search-form").on("submit", function(e){
       e.preventDefault();
       var search_val = $("#drill-search-term").val();
-      var search_url = "https://www.google.com/webhp?ie=UTF-8#q="+search_val+"%20site%3Adrill.apache.org%20OR%20site%3Aissues.apache.org%2Fjira%2Fbrowse%2FDRILL%20OR%20site%3Amail-archives.apache.org%2Fmod_mbox%2Fdrill-user";
-      var form = $("#menu .search-bar form#search-using-google");
-      form.attr("action",search_url);
-      form.submit();
-      form.attr("action","");
+      var search_url = "{{ site.baseurl }}/search/?q="+search_val;
+      document.location.href = search_url;
     });
   },
 

http://git-wip-us.apache.org/repos/asf/drill/blob/c4a4fd1e/js/script.js
----------------------------------------------------------------------
diff --git a/js/script.js b/js/script.js
index 4cea01b..4657de2 100755
--- a/js/script.js
+++ b/js/script.js
@@ -1,7 +1,5 @@
-// JavaScript Document
-
-
-
+---
+---
 var reelPointer = null;
 $(document).ready(function(e) {
 	
@@ -33,45 +31,14 @@ $(document).ready(function(e) {
 			$(this).addClass("parent");	
 		}
     });
-	
-	$("#menu ul li.parent").mouseenter(function() {
-		closeSearch();
-	});
-	
+
 	$("#header .dots .dot:eq(0)").addClass("sel");
 	
-	$("#menu ul li.l").click(function() {
-		if ($(this).hasClass("open")) {
-			//devo chiudere	
-			closeSearch();
-		} else {
-			//devo aprire
-			$("#search").css({ display: "block", paddingTop: "0px", paddingBottom: "0px", marginTop:"-40px" }).animate({ paddingTop: "30px", paddingBottom: "30px", marginTop: "0px" },400,"easeOutQuint");
-			$("#search input").trigger("focus").select();
-			$(this).addClass("open");
-		}
-	});
-	
-	$("#search input").val("").keypress(function(e) {
-		if(e.keyCode == 13 && $(this).val()) {
-			document.location.href = "https://www.google.com/webhp?ie=UTF-8#q="+$(this).val()+"%20site%3Aincubator.apache.org%2Fdrill%20OR%20site%3Aissues.apache.org%2Fjira%2Fbrowse%2FDRILL%20OR%20site%3Amail-archives.apache.org%2Fmod_mbox%2Fincubator-drill-dev";
-		}
-	});	
-    
 	resized();
 	
 	$(window).scroll(onScroll);
 });
 
-function closeSearch() {
-	var R = ($("#menu ul li.l.open").length) ? true : false;
-	$("#menu ul li.l").removeClass("open");
-	$("#search").stop(false,true,false).animate({ paddingTop: "0px", paddingBottom: "0px", marginTop: "-40px" },400,"easeInQuint",function() {
-		$(this).css({ display: "none" });	
-	});
-	return R;
-}
-
 var reel_currentIndex = 0;
 function resized() {
 	
@@ -90,8 +57,8 @@ function resized() {
 		$(this).find(".tc").css({ top: Math.round(d/2)+"px" });
 	});
 	
-	if (WW < 999) $("#menu, #search").addClass("r");
-	else $("#menu, #search").removeClass("r");
+	if (WW < 999) $("#menu").addClass("r");
+	else $("#menu").removeClass("r");
 	
 	onScroll();
 		
@@ -123,10 +90,8 @@ function onScroll() {
 	var ST = document.body.scrollTop || document.documentElement.scrollTop;
 	if ($("#menu.r").length) {
 		$("#menu.r").css({ top: ST+"px" });	
-		$("#search.r").css({ top: (ST+50)+"px" });	
 	} else {
 		$("#menu").css({ top: "0px" });
-		$("#search").css({ top: "50px" });
 	}
 	
 	if (ST > 400) $("#subhead").addClass("show");	

http://git-wip-us.apache.org/repos/asf/drill/blob/c4a4fd1e/search.html
----------------------------------------------------------------------
diff --git a/search.html b/search.html
new file mode 100644
index 0000000..6ca4915
--- /dev/null
+++ b/search.html
@@ -0,0 +1,20 @@
+---
+layout: default
+title: Search
+---
+<link href="{{ site.baseurl }}/css/search.css" rel="stylesheet" type="text/css">
+
+<script>
+  (function() {
+    var cx = '009783892129588168944:67cuvhvyrtk';
+    var gcse = document.createElement('script');
+    gcse.type = 'text/javascript';
+    gcse.async = true;
+    gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+        '//cse.google.com/cse.js?cx=' + cx;
+    var s = document.getElementsByTagName('script')[0];
+    s.parentNode.insertBefore(gcse, s);
+  })();
+</script>
+<div class="int_search" align="left"><gcse:searchresults-only></gcse:searchresults-only></div>
+


[07/50] [abbrv] drill git commit: DRILL-1503

Posted by ts...@apache.org.
DRILL-1503


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

Branch: refs/heads/gh-pages
Commit: 19b002869fb63455fea7f8c611ee9c1a5f01231f
Parents: 41da95b
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Apr 29 15:41:10 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Apr 29 15:41:10 2015 -0700

----------------------------------------------------------------------
 .../090-mongodb-plugin-for-apache-drill.md             | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/19b00286/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md b/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
index 9e2d41e..8fd5b1a 100644
--- a/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
+++ b/_docs/connect-a-data-source/090-mongodb-plugin-for-apache-drill.md
@@ -4,19 +4,12 @@ parent: "Connect a Data Source"
 ---
 ## Overview
 
-You can leverage the power of Apache Drill to query data without any upfront
-schema definitions. Drill enables you to create an architecture that works
-with nested and dynamic schemas, making it the perfect SQL query tool to use
-on NoSQL databases, such as MongoDB.
-
-As of Apache Drill 0.6, you can configure MongoDB as a Drill data source.
 Drill provides a mongodb format plugin to connect to MongoDB, and run queries
-on the data using ANSI SQL.
+to read, but not to write, the Mongo data ANSI SQL. You do not need any upfront schema definitions.
 
-This tutorial assumes that you have Drill installed locally (embedded mode),
+This procedures in this section assume that you have Drill installed locally (embedded mode),
 as well as MongoDB. Examples in this tutorial use zip code aggregation data
-provided by MongoDB. Before You Begin provides links to download tools and data
-used throughout the tutorial.
+provided by MongoDB. Before You Begin provides links to download tools and data.
 
 {% include startnote.html %}A local instance of Drill is used in this tutorial for simplicity. {% include endnote.html %}
 


[11/50] [abbrv] drill git commit: MD-123 edit 2

Posted by ts...@apache.org.
MD-123 edit 2


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

Branch: refs/heads/gh-pages
Commit: 404a042c303db74f193d846db7c01902fcf25c43
Parents: a0f5e42
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Apr 29 16:31:55 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Apr 29 16:31:55 2015 -0700

----------------------------------------------------------------------
 .../010-installing-the-driver-on-windows.md              | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/404a042c/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
index 431cdf1..7435779 100755
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
@@ -39,16 +39,11 @@ To install the driver, you need Administrator privileges on the computer.
 
 ## The Tableau Data-connection Customization (TDC) File
 
-The MapR Drill ODBC Driver includes a file named `MapRDrillODBC.TDC`. The TDC
-file includes customizations that improve ODBC configuration and performance
+The MapR Drill ODBC Driver includes a file named `MapRDrillODBC.TDC`. The TDC file file includes customizations that improve ODBC configuration and performance
 when using Tableau.
 
-If you install Tableau after you install the MapR Drill ODBC driver, you must
-install the Tableau TDC FIle. When Tableau is already installed on the
-machine, the TDC file is installed automatically when you install the MapR Drill ODBC driver.
-
 ### Installing the TDC File
-The MapR Drill ODBC driver installer installs the TDC file automatically. If you installed the MapR Drill ODBC driver first and then installed Tableau, you need to install the TDC file manually. 
+The MapR Drill ODBC driver installer automatically installs the TDC file if the installer can find the Tableau installation. If you installed the MapR Drill ODBC driver first and then installed Tableau, the TDC file is not installed automatically, and you need to install the TDC file manually. 
 
 **To install the MapRDrillODBC.TDC file manually:**
 
@@ -56,7 +51,7 @@ The MapR Drill ODBC driver installer installs the TDC file automatically. If you
   2. When the installation completes, press any key to continue.   
 For example, you can press the SPACEBAR key.
 
-If the installation of the Tableau datasource connection (TDC) file fails, this is likely due to your Tableau repository being in a different location.  In this case, you should manually copy the TDC file to the Datasources folder in the My Tableau Repository. By default, the My Tableau Repository is located in C:\Users\<user>\Documents\My Tableau Repository.
+If the installation of the TDC file fails, this is likely due to your Tableau repository being in location other than the default one.  In this case, manually copy the My Tableau Repository to C:\Users\<user>\Documents\My Tableau Repository.
 
 
 #### What's Next? Go to [Step 2. Configure ODBC Connections to Drill Data Sources]({{ site.baseurl }}/docs/configuring-connections-on-windows).


[31/50] [abbrv] drill git commit: Merge branch 'gh-pages' of https://github.com/tshiran/drill into gh-pages

Posted by ts...@apache.org.
Merge branch 'gh-pages' of https://github.com/tshiran/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/a4264b98
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/a4264b98
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/a4264b98

Branch: refs/heads/gh-pages
Commit: a4264b98f63dfdf5850012376e7d9d21252afec9
Parents: d0d7693 9109d7a
Author: Tomer Shiran <ts...@gmail.com>
Authored: Thu Apr 30 10:24:36 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Thu Apr 30 10:24:36 2015 -0700

----------------------------------------------------------------------
 .../060-hbase-storage-plugin.md                 | 21 ++++++++++----------
 ...-multi-instance-architecture-introduction.md |  7 +++----
 .../015-how-to-run-drill-in-a-cluster.md        | 17 +++++++---------
 .../017-how-multiple-users-share-a-drillbit.md  | 12 ++++++-----
 .../010-configuration-options-introduction.md   |  4 +++-
 .../data-types/010-supported-data-types.md      |  5 +++--
 _docs/tutorials/010-tutorials-introduction.md   |  6 +++++-
 7 files changed, 39 insertions(+), 33 deletions(-)
----------------------------------------------------------------------



[42/50] [abbrv] drill git commit: Merge branch 'gh-pages' of https://github.com/tshiran/drill into gh-pages

Posted by ts...@apache.org.
Merge branch 'gh-pages' of https://github.com/tshiran/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/f68f73b9
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/f68f73b9
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/f68f73b9

Branch: refs/heads/gh-pages
Commit: f68f73b9fa7cbfafcfab360e81424ce4d413764c
Parents: 7635267 d26819a
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 17:08:53 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 17:08:53 2015 -0700

----------------------------------------------------------------------
 _includes/menu.html |  1 -
 css/search.css      |  9 +++++++++
 css/style.css       | 26 --------------------------
 js/drill.js         | 21 ++++++++++++++++-----
 js/script.js        | 45 +++++----------------------------------------
 search.html         | 20 ++++++++++++++++++++
 6 files changed, 50 insertions(+), 72 deletions(-)
----------------------------------------------------------------------



[16/50] [abbrv] drill git commit: WIP on footer. Cannot get it to be sticky at the moment. needs more work.

Posted by ts...@apache.org.
WIP on footer. Cannot get it to be sticky at the moment. needs more
work.


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

Branch: refs/heads/gh-pages
Commit: b64cd54e69a574c892211ce8e235bbcc28ca08d0
Parents: ffa8300
Author: Danny <dk...@batchblue.com>
Authored: Wed Apr 29 20:04:57 2015 -0400
Committer: Danny <dk...@batchblue.com>
Committed: Wed Apr 29 20:04:57 2015 -0400

----------------------------------------------------------------------
 css/docpage.css | 8 --------
 css/style.css   | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/b64cd54e/css/docpage.css
----------------------------------------------------------------------
diff --git a/css/docpage.css b/css/docpage.css
index e66ff6f..0f074f5 100644
--- a/css/docpage.css
+++ b/css/docpage.css
@@ -415,10 +415,6 @@ span.expand.show, span.contract.show {
   div.doc-nav {
     margin-left: 30px;
   }
-
-  #footer {
-    text-align: left;
-  }
   .main-content
   {
     margin-left: 313px;
@@ -426,10 +422,6 @@ span.expand.show, span.contract.show {
   #menu ul li.logo {
     padding-left: 30px;
   }
-
-  #footer {
-    width: auto;
-  }
   #footer .wrapper {
     margin-left: 293px;
   }

http://git-wip-us.apache.org/repos/asf/drill/blob/b64cd54e/css/style.css
----------------------------------------------------------------------
diff --git a/css/style.css b/css/style.css
index 9e524e1..88d252e 100755
--- a/css/style.css
+++ b/css/style.css
@@ -630,9 +630,9 @@ table.intro a {
   content: "";
 }
 #footer {
-	background:#232323;
-	color:#FFF;
-	font-size:10px;
+  color: black;
+  background-color: white;
+	font-size:9px;
 	font-weight:lighter;
 	line-height:20px;
 	padding:30px 0;


[03/50] [abbrv] drill git commit: Parquet blog post

Posted by ts...@apache.org.
Parquet blog post


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

Branch: refs/heads/gh-pages
Commit: 5716a41214ac8100b29cc706dc85a319af4cc0db
Parents: 12c8c2f
Author: Tomer Shiran <ts...@gmail.com>
Authored: Wed Apr 29 15:06:03 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Wed Apr 29 15:06:03 2015 -0700

----------------------------------------------------------------------
 ...che-parquet-graudates-to-a-top-level-project.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/5716a412/blog/_posts/2015-04-30-apache-parquet-graudates-to-a-top-level-project.md
----------------------------------------------------------------------
diff --git a/blog/_posts/2015-04-30-apache-parquet-graudates-to-a-top-level-project.md b/blog/_posts/2015-04-30-apache-parquet-graudates-to-a-top-level-project.md
new file mode 100644
index 0000000..6fbc4a0
--- /dev/null
+++ b/blog/_posts/2015-04-30-apache-parquet-graudates-to-a-top-level-project.md
@@ -0,0 +1,17 @@
+---
+layout: post
+title: "Apache Parquet Graduates to a Top-Level Project"
+code: apache-parquet-graudates-to-a-top-level-project
+excerpt: The Apache Parquet project has graduated to a top-level project (TLP) at the Apache Software Foundation.
+authors: ["tshiran"]
+---
+It's an exciting day. Apache Parquet, the de-facto standard open source columnar format, has graduated to an Apache top-level project.
+
+The Drill project supports a variety of file formats, but Parquet is the highest performing format, and it's the one we recommend to anyone who wants to maximize the performance of their queries.
+
+We've had the pleasure of working closely with the Parquet community for over a year, and it's exciting to see how much the project has evolved. We've made a number of contributions to the project, and we're gearing up for a major contribution after the Parquet 1.7 release.
+
+I wanted to congratulate Twitter's Julian Le Dem ([@j_](https://twitter.com/j_)), VP of Apache Parquet, and the entire Parquet community on the graduation milestone. Oh, and how can I get a two-letter Twitter handle?
+
+Happy Drilling!
+Tomer Shiran


[21/50] [abbrv] drill git commit: Moving breadcrumbs into larger container to have extended border bottom. Got rid of rougue 1px above dl button in menu. Still exists at 110%, but this is an improvement. Restored original /docs.html page by adding noChil

Posted by ts...@apache.org.
Moving breadcrumbs into larger container to have extended border bottom.
Got rid of rougue 1px above dl button in menu. Still exists at 110%, but
this is an improvement. Restored original /docs.html page by adding
noChildren var to top matter, and checking that in order to display
content or not. Adding and adjusting margins where needed, which
restored clipped blog titles. Changing class fa on homepage section, as
that is used by font awesome.


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

Branch: refs/heads/gh-pages
Commit: d14f5a8f79b6c3a4e294c19d8a25a521f4976fbe
Parents: 0906e2a
Author: Danny <dk...@batchblue.com>
Authored: Thu Apr 30 09:07:26 2015 -0400
Committer: Danny <dk...@batchblue.com>
Committed: Thu Apr 30 09:07:26 2015 -0400

----------------------------------------------------------------------
 _layouts/docpage.html | 15 ++++++++++-----
 css/breadcrumbs.css   |  4 +++-
 css/docpage.css       | 18 +++++++++++++-----
 css/responsive.css    |  8 ++++----
 css/style.css         | 18 +++++++++++-------
 docs.html             |  8 +++++++-
 index.html            |  2 +-
 js/drill.js           | 12 ++++++++++++
 8 files changed, 61 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/_layouts/docpage.html
----------------------------------------------------------------------
diff --git a/_layouts/docpage.html b/_layouts/docpage.html
index ba7da43..72fb5b5 100644
--- a/_layouts/docpage.html
+++ b/_layouts/docpage.html
@@ -12,20 +12,24 @@ title: Documentation
 
   {% include doctoc.html %}
 
+
+  {% include breadcrumbs.html %}
   <div class="main-content-wrapper">
     <div class="main-content">
 
-      {% include breadcrumbs.html %}
+      {% if page.relative_path %}
+        <a class="edit-link" href="https://github.com/apache/drill/blob/gh-pages/{{ page.relative_path }}" target="_blank"><i class="fa fa-pencil-square-o"></i></a>
+      {% endif %}
 
       <div class="int_title">
         <h1>{{ page.title }}</h1>
+
       </div>
 
       <link href="{{ site.baseurl }}/css/docpage.css" rel="stylesheet" type="text/css">
 
       <div class="int_text" align="left">
-        <a class="edit-link" href="https://github.com/apache/drill/blob/gh-pages/{{ page.relative_path }}" target="_blank"><i class="fa fa-pencil-square-o"></i></a>
-        {% if page_data.children.size == 0 %}
+        {% if page_data.children.size == 0 or page.noChildren %}
           {{ content }}
       {% else %}
           <ul>
@@ -41,8 +45,9 @@ title: Documentation
         {% endfor %}
         </ul>
       {% endif %}
-
-        {% include docnav.html %}
+        {% unless page.noChildren %}
+          {% include docnav.html %}
+      {% endunless %}
       </div>
     </div>
   </div>

http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/css/breadcrumbs.css
----------------------------------------------------------------------
diff --git a/css/breadcrumbs.css b/css/breadcrumbs.css
index 0f72e06..e9503c4 100644
--- a/css/breadcrumbs.css
+++ b/css/breadcrumbs.css
@@ -3,8 +3,10 @@
   display: block;
   padding: 0.5625rem 0 0.5625rem 0;
   overflow: hidden;
-  margin-top: 55px;
+  margin-top: 56px;
+  margin-left: 0px;
   list-style: none;
+  border-bottom: solid 1px #E4E4E4;
   width: 100%;
 }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/css/docpage.css
----------------------------------------------------------------------
diff --git a/css/docpage.css b/css/docpage.css
index 0f074f5..1b120e4 100644
--- a/css/docpage.css
+++ b/css/docpage.css
@@ -24,6 +24,7 @@
 div.doc-nav {
   overflow: auto;
   width: 100%;
+  margin-top: 30px;
 }
 div.doc-nav a{
   text-decoration: none;
@@ -51,7 +52,7 @@ div.doc-nav span.next-toc {
 
 .main-content .int_text {
   margin-left: 0px;
-  margin-top:30px;
+  margin-top: 0px;
 }
 .main-content .int_text img {
   margin: 30px 0px;
@@ -68,7 +69,8 @@ div.doc-nav span.next-toc {
 .main-content .edit-link {
   position: relative;
   float: right;
-  bottom: 105px;
+  margin-top: 13px;
+  margin-right: 20px;
   text-decoration: none;
   font-size: 24px;
   color: #333333;
@@ -358,6 +360,9 @@ span.expand.show, span.contract.show {
   #footer {
     margin-left: 0px;
   }
+  .main-content .edit-link {
+    margin-right: 0px; /* container takes care of right margin */
+  }
 
   #menu ul li.toc-categories {
     display: inline-block;
@@ -412,9 +417,6 @@ span.expand.show, span.contract.show {
   .main-content-wrapper {
     width: 1092px; 
   }
-  div.doc-nav {
-    margin-left: 30px;
-  }
   .main-content
   {
     margin-left: 313px;
@@ -425,6 +427,12 @@ span.expand.show, span.contract.show {
   #footer .wrapper {
     margin-left: 293px;
   }
+ .breadcrumbs {
+    margin-left: 0px;
+  }
+  .breadcrumbs li:first-of-type {
+    margin-left: 301px;
+  }
 }
 /*
 div.page-wrap:after {

http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/css/responsive.css
----------------------------------------------------------------------
diff --git a/css/responsive.css b/css/responsive.css
index 99d4c5a..9aeed3e 100644
--- a/css/responsive.css
+++ b/css/responsive.css
@@ -1,6 +1,3 @@
-nav.breadcrumbs{
-  margin-left: -8px;
-}
 #menu ul li.toc-categories {
   display:none;
 }
@@ -35,6 +32,9 @@ nav.breadcrumbs{
   .mw {
     min-width: 0px;
   }
+  .breadcrumbs li:first-of-type {
+    margin-left: 8px;
+  }
   #menu ul li.logo {
     padding-left: 30px;
   }
@@ -195,7 +195,7 @@ nav.breadcrumbs{
     text-align: left;
     padding-left: 70px;
   }
-  table.intro td.ag, table.intro td.fl, table.intro td.fa {
+  table.intro td.ag, table.intro td.fl, table.intro td.fam {
     background-position: 30px 23%;
   }
   table.intro p {

http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/css/style.css
----------------------------------------------------------------------
diff --git a/css/style.css b/css/style.css
index ed8fbe5..8ec44af 100755
--- a/css/style.css
+++ b/css/style.css
@@ -89,7 +89,7 @@ a.anchor {
 #menu ul li a {
 	color:#FFF;
 	text-decoration:none;
-	line-height:51px;
+	line-height:50px;
 	padding:14px 20px;
 }
 /*
@@ -104,7 +104,7 @@ a.anchor {
 	font-size:12px;
 	text-transform:uppercase;
 }
-#menu ul li.d a .fa {
+#menu ul li.d a .fam {
   position: relative;
   right: 8px;
   font-size: 14px;
@@ -119,9 +119,8 @@ a.anchor {
 }
 
 #menu ul li.d a {
-	padding:0 30px 0 40px;
+	padding:0px 30px 0 40px;
 	display:block;
-	height:50px;
 }
 
 
@@ -244,7 +243,7 @@ a.anchor {
 	background-image:url(../images/flexibility-w.png);
 }
 
-#subhead ul li.fa a {
+#subhead ul li.fam a {
 	background-image:url(../images/familiarity-w.png);
 }
 
@@ -499,7 +498,7 @@ table.intro td.fl {
 	background-image:url(../images/flexibility.png);
 }
 
-table.intro td.fa {
+table.intro td.fam {
 	background-image:url(../images/familiarity.png);
 }
 
@@ -697,10 +696,15 @@ table.intro a {
 }
 
 .int_text {
-	margin:40px auto 60px auto;
+	margin:40px auto 30px auto;
 	width:780px;
 }
 
+/* Blog */
+div.post.int_text {
+	margin:40px auto 60px auto;
+}
+
 .int_text a, .int_title a {
 	color:#1a6bc7;
 	/* font-weight:normal;	*/

http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/docs.html
----------------------------------------------------------------------
diff --git a/docs.html b/docs.html
index 81ba12a..f00adf8 100644
--- a/docs.html
+++ b/docs.html
@@ -1,6 +1,12 @@
 ---
 layout: docpage
 title: Documentation
+noChildren: true
+relative_path: 'docs.html'
 ---
 
-    Welcome to the Apache Drill Documentation. If you're new to Drill, try out one of these resources:
+
+Welcome to the Apache Drill Documentation. If you're new to Drill, try out one of these resources:
+<ul>
+  <li><a href="{{ site.baseurl }}/docs/analyzing-the-yelp-academic-dataset/">Analyzing the Yelp Academic Dataset</a></li>
+</ul>

http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 6485fc0..a3351af 100755
--- a/index.html
+++ b/index.html
@@ -39,7 +39,7 @@ layout: default
           <p>Analyze semi-structured/nested data coming from NoSQL applications</p>
           <span><a href="#flexibility">LEARN MORE</a></span>
         </td>
-        <td class="fa">
+        <td class="fam">
           <h1>Familiarity</h1>
           <p>Leverage existing SQL skillsets, BI tools and Apache Hive deployments</p>
           <span><a href="#familiarity">LEARN MORE</a></span>

http://git-wip-us.apache.org/repos/asf/drill/blob/d14f5a8f/js/drill.js
----------------------------------------------------------------------
diff --git a/js/drill.js b/js/drill.js
index bf276f8..8e808db 100644
--- a/js/drill.js
+++ b/js/drill.js
@@ -116,8 +116,10 @@ Drill.Docs = {
       //  This relies on .sidebar's 'left' attribute...may be a cleaner approach
       if($(".sidebar").css('left') == '0px'){
         Drill.Docs._contractSidebar();
+        //Drill.Docs._contractView();
       } else {
         Drill.Docs._expandSidebar();
+        //Drill.Docs._expandView();
       }
     })
   },
@@ -202,10 +204,20 @@ Drill.Docs = {
     $(".sidebar").addClass("force-expand");
   },
 
+  _expandView : function(){
+    $("nav.breadcrumbs li:first").addClass("force-expand");
+    $(".main-content").addClass("force-expand");
+  },
+
   _contractSidebar : function() {
     $(".sidebar").removeClass("force-expand");
   },
 
+  _contractView : function() {
+    $("nav.breadcrumbs li:first").removeClass("force-expand");
+    $(".main-content").removeClass("force-expand");
+  },
+
   _make_current : function(that) {
     Drill.Docs._remove_current();
     $(that).addClass("current_section");


[43/50] [abbrv] drill git commit: exhume wiki maprdb format

Posted by ts...@apache.org.
exhume wiki maprdb format


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

Branch: refs/heads/gh-pages
Commit: 3249804560e4496cec66dc731f3031790677deea
Parents: f68f73b
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 17:18:00 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 17:18:00 2015 -0700

----------------------------------------------------------------------
 .../connect-a-data-source/100-mapr-db-format.md | 42 ++++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/32498045/_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 f00d2d2..269b783 100644
--- a/_docs/connect-a-data-source/100-mapr-db-format.md
+++ b/_docs/connect-a-data-source/100-mapr-db-format.md
@@ -2,33 +2,31 @@
 title: "MapR-DB Format"
 parent: "Connect a Data Source"
 ---
-Drill includes a `maprdb` format plugin for accessing data stored in MapR-DB. The Drill Sandbox also includes the following `maprdb` format plugin on a MapR node:
+Drill includes a `maprdb` format plugin 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 plugin 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
+and MapR-FS share the same namespace.
 
-    {
-      "type": "hbase",
-      "config": {
-        "hbase.table.namespace.mappings": "*:/tables"
-      },
-      "size.calculator.enabled": false,
-      "enabled": true
-    }
+You can query tables stored across multiple directories. You do not need to
+create a table mapping to a directory before you query a table in the
+directory. You can select from any table in any directory the same way you
+would select from files in MapR-FS, using the same syntax.
 
-Using the Sandbox and this `maprdb` format plugin, you can query HBase tables located in the `/tables` directory, as shown in the ["Query HBase"]({{ site.baseurl }}/docs/querying-hbase) examples.
+Instead of including the name of a file, you include the table name in the
+query.
 
-The `dfs` storage plugin includes the maprdb format when you install Drill from the `mapr-drill` package on a MapR node. Click **Update** next to the `dfs` instance
-in the Web UI of the Drill Sandbox to view the configuration for the `dfs` instance:
-
-![drill query flow]({{ site.baseurl }}/docs/img/18.png)
-
-
-The examples of the [CONVERT_TO/FROM functions]({{ site.baseurl }}/docs/data-type-conversion#convert_to-and-convert_from) show how to adapt the `dfs` storage plugin to use the `maprdb` format plugin to query HBase tables on the Sandbox.
+**Example**
 
-You modify the `dfs` storage plugin to create a table mapping to a directory in the MapR-FS file system. You then select the table by name.
+    SELECT * FROM mfs.`/users/max/mytable`;
 
-**Example**
+Drill stores the `maprdb` format plugin in the `dfs` storage plugin instance,
+which you can view in the Drill Web UI. You can access the Web UI at
+[http://localhost:8047/storage](http://localhost:8047/storage). Click **Update** next to the `dfs` instance
+in the Web UI to view the configuration for the `dfs` instance.
 
-    SELECT * FROM myplugin.`mytable`;
+The following image shows a portion of the configuration with the `maprdb`
+format plugin for the `dfs` instance:
 
-The `maprdb` format plugin improves the
-estimated number of rows that Drill uses to plan a query. Using the `dfs` storage plugin, you can query HBase and MapR-DB tables as you would query files in a file system. MapR-DB, MapR-FS, and Hadoop files share the same namespace.
+![drill query flow]({{ site.baseurl }}/docs/img/18.png)
 


[25/50] [abbrv] drill git commit: comment out parallelization example

Posted by ts...@apache.org.
comment out parallelization example


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

Branch: refs/heads/gh-pages
Commit: 0ac6ebc99461fb7a37fcc0c7b521d5edccb3e8e1
Parents: df45a67
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 08:24:06 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 08:24:06 2015 -0700

----------------------------------------------------------------------
 _docs/manage-drill/017-how-multiple-users-share-a-drillbit.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/0ac6ebc9/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md b/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md
index b24aa4b..82f020a 100644
--- a/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md
+++ b/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md
@@ -39,7 +39,9 @@ To configure parallelization, configure the following options in the `sys.option
 * `planner.width.max.per.query`  
   Same as max per node but applies to the query as executed by the entire cluster.
 
-Configure the `planner.width.max.per.node` to achieve fine grained, absolute control over parallelization. ??For example, setting the `planner.width.max.per.query` to 60 will not accelerate Drill operations because overlapping does not occur when executing 60 queries at the same time.??
+Configure the `planner.width.max.per.node` to achieve fine grained, absolute control over parallelization. 
+
+<!-- ??For example, setting the `planner.width.max.per.query` to 60 will not accelerate Drill operations because overlapping does not occur when executing 60 queries at the same time.??
 
 ### Example of Configuring Parallelization
 
@@ -47,7 +49,7 @@ For example, the default settings parallelize 70 percent of operations up to 1,0
 
 A parallelizer in the Foreman transforms the physical plan into multiple phases. A complicated query can have multiple, major fragments. A default parallelization of 70 percent of operations allows some overlap of query phases. In the example, 210 ??for each core or major fragment to a maximum of 410??.
 
-??Drill uses pipelines, blocking/nonblocking, memory is not fungible. CPU resources are fungible. There is contention for CPUs.??
+??Drill uses pipelines, blocking/nonblocking, memory is not fungible. CPU resources are fungible. There is contention for CPUs.?? -->
 
 ## Data Isolation
 


[38/50] [abbrv] drill git commit: commands reorg

Posted by ts...@apache.org.
http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/120-use-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/120-use-command.md b/_docs/sql-reference/sql-commands-summary/120-use-command.md
deleted file mode 100644
index 1dc656c..0000000
--- a/_docs/sql-reference/sql-commands-summary/120-use-command.md
+++ /dev/null
@@ -1,170 +0,0 @@
----
-title: "USE Command"
-parent: "SQL Commands Summary"
----
-The USE command changes the schema context to the specified schema. When you
-issue the USE command to switch to a particular schema, Drill queries that
-schema only.
-
-## Syntax
-
-The USE command supports the following syntax:
-
-    USE schema_name;
-
-## Parameters
-
-_schema_name_  
-A unique name for a Drill schema. A schema in Drill is a configured storage
-plugin, such as hive, or a storage plugin and workspace. For example,
-`dfs.donuts` where `dfs` is an instance of the file system configured as a
-storage plugin, and `donuts` is a workspace configured to point to a directory
-within the file system. You can configure and use multiple storage plugins and
-workspaces in Drill. See [Storage Plugin Registration]({{ site.baseurl }}/docs/storage-plugin-registration) and
-[Workspaces]({{ site.baseurl }}/docs/Workspaces).
-
-## Usage Notes
-
-Issue the USE command to change to a particular schema. When you use a schema,
-you do not have to include the full path to a file or table in your query.  
-  
-For example, to query a file named `donuts.json` in the
-`/users/max/drill/json/` directory, you must include the full file path in
-your query if you do not use a defined workspace
-
-    SELECT * FROM dfs.`/users/max/drill/json/donuts.json` WHERE type='frosted';
-
-If you create a schema that points to the `~/json` directory where the file is
-located and then use the schema, you can issue the query without explicitly
-stating the file path:
-
-    USE dfs.json;  
-    SELECT * FROM `donuts.json`WHERE type='frosted';
-
-If you do not use a schema before querying a table, you must use absolute
-notation, such as `[schema.]table[.column]`, to query the table. If you switch
-to the schema where the table exists, you can just specify the table name in
-the query. For example, to query a table named "`products`" in the `hive`
-schema, tell Drill to use the hive schema and then issue your query with the
-table name only:
-
-    USE hive;  
-    SELECT * FROM products limit 5;   
-  
-Before you issue the USE command, you may want to run SHOW DATABASES or SHOW
-SCHEMAS to see a list of the configured storage plugins and workspaces.
-
-## Example
-
-This example demonstrates how to use a file system and a hive schema to query
-a file and table in Drill.  
-  
-Issue the SHOW DATABASES or SHOW SCHEMAS command to see a list of the
-available schemas that you can use. Both commands return the same results.
-
-    0: jdbc:drill:zk=drilldemo:5181> show schemas;
-    +-------------+
-    | SCHEMA_NAME |
-    +-------------+
-    | hive.default |
-    | dfs.reviews |
-    | dfs.flatten |
-    | dfs.default |
-    | dfs.root    |
-    | dfs.logs    |
-    | dfs.myviews   |
-    | dfs.clicks  |
-    | dfs.tmp     |
-    | sys         |
-    | hbase       |
-    | INFORMATION_SCHEMA |
-    | s3.twitter  |
-    | s3.reviews  |
-    | s3.default  |
-    +-------------+
-    15 rows selected (0.059 seconds)
-
-
-Issue the USE command with the schema that you want Drill to query.  
-**Note:** If you use any of the Drill default schemas, such as `cp.default` or `dfs.default`, do not include .`default`. For example, if you want Drill to issue queries on files in its classpath, you can issue the following command:
-
-    0: jdbc:drill:zk=local> use cp;
-    +------------+------------+
-    |     ok     |  summary   |
-    +------------+------------+
-    | true       | Default schema changed to 'cp' |
-    +------------+------------+
-    1 row selected (0.04 seconds)
-
-Issue the USE command with a file system schema.
-
-    0: jdbc:drill:zk=drilldemo:5181> use dfs.logs;
-    +------------+------------+
-    |     ok     |  summary   |
-    +------------+------------+
-    | true       | Default schema changed to 'dfs.logs' |
-    +------------+------------+
-    1 row selected (0.054 seconds)
-
-You can issue the SHOW FILES command to view the files and directories within
-the schema.
-
-    0: jdbc:drill:zk=drilldemo:5181> show files;
-    +------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
-    |    name    | isDirectory |   isFile   |   length   |   owner    |   group    | permissions | accessTime | modificationTime |
-    +------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
-    | csv        | true        | false      | 1          | mapr       | mapr       | rwxrwxr-x   | 2015-02-09 06:49:17.0 | 2015-02-09 06:50:11.172 |
-    | logs       | true        | false      | 3          | mapr       | mapr       | rwxrwxr-x   | 2014-12-16 18:58:26.0 | 2014-12-16 18:58:27.223 |
-    +------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
-    2 rows selected (0.156 seconds)
-
-Query a file or directory in the file system schema.
-
-    0: jdbc:drill:zk=drilldemo:5181> select * from logs limit 5;
-    +------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+
-    |    dir0    |    dir1    |  trans_id  |    date    |    time    |  cust_id   |   device   |   state    |  camp_id   |  keywords  |  prod_id   | purch_flag |
-    +------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+
-    | 2014       | 8          | 24181      | 08/02/2014 | 09:23:52   | 0          | IOS5       | il         | 2          | wait       | 128        | false      |
-    | 2014       | 8          | 24195      | 08/02/2014 | 07:58:19   | 243        | IOS5       | mo         | 6          | hmm        | 107        | false      |
-    | 2014       | 8          | 24204      | 08/01/2014 | 12:10:27   | 12048      | IOS6       | il         | 1          | marge      | 324        | false      |
-    | 2014       | 8          | 24222      | 08/02/2014 | 16:28:37   | 2488       | IOS6       | pa         | 2          | to         | 391        | false      |
-    | 2014       | 8          | 24227      | 08/02/2014 | 07:14:00   | 154687     | IOS5       | wa         | 2          | on         | 376        | false      |
-    +------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+
-
-Issue the USE command to switch to the hive schema.
-
-    0: jdbc:drill:zk=drilldemo:5181> use hive;
-    +------------+------------+
-    |     ok     |  summary   |
-    +------------+------------+
-    | true       | Default schema changed to 'hive' |
-    +------------+------------+
-    1 row selected (0.093 seconds)
-
-Issue the SHOW TABLES command to see the tables that exist within the schema.
-
-    0: jdbc:drill:zk=drilldemo:5181> show tables;
-    +--------------+------------+
-    | TABLE_SCHEMA | TABLE_NAME |
-    +--------------+------------+
-    | hive.default | orders     |
-    | hive.default | products   |
-    +--------------+------------+
-    2 rows selected (0.421 seconds)
-
-Query a table within the schema.
-
-    0: jdbc:drill:zk=drilldemo:5181> select * from products limit 5;
-    +------------+------------+------------+------------+
-    |  prod_id   |    name    |  category  |   price    |
-    +------------+------------+------------+------------+
-    | 0          | Sony notebook | laptop     | 959        |
-    | 1          | #10-4 1/8 x 9 1/2 Premium Diagonal Seam Envelopes | Envelopes  | 16         |
-    | 2          | #10- 4 1/8 x 9 1/2 Recycled Envelopes | Envelopes  | 9          |
-    | 3          | #10- 4 1/8 x 9 1/2 Security-Tint Envelopes | Envelopes  | 8          |
-    | 4          | #10 Self-Seal White Envelopes | Envelopes  | 11         |
-    +------------+------------+------------+------------+
-    5 rows selected (0.211 seconds)
-
-  
-

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/005-supported-sql-commands.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/005-supported-sql-commands.md b/_docs/sql-reference/sql-commands/005-supported-sql-commands.md
new file mode 100644
index 0000000..233019f
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/005-supported-sql-commands.md
@@ -0,0 +1,9 @@
+---
+title: Supported SQL Commands
+parent: "SQL Commands"
+---
+The following table provides a list of the SQL commands that Drill supports,
+with their descriptions and example syntax:
+
+<table style='table-layout:fixed;width:100%'>
+    <tr><th >Command</th><th >Description</th><th >Syntax</th></tr><tr><td valign="top" width="15%"><a href="/docs/alter-session-command">ALTER SESSION</a></td><td valign="top" width="60%">Changes a system setting for the duration of a session. A session ends when you quit the Drill shell. For a list of Drill options and their descriptions, refer to <a href="/docs/planning-and-execution-options">Planning and Execution Options</a>.</td><td valign="top"><pre>ALTER SESSION SET `&lt;option_name&gt;`=&lt;value&gt;;</pre></td></tr><tr><td valign="top" ><a href="/docs/alter-system-command">ALTER SYSTEM</a></td><td valign="top" >Permanently changes a system setting. The new settings persist across all sessions. For a list of Drill options and their descriptions, refer to <a href="/docs/planning-and-execution-options">Planning and Execution Options</a>.</td><td valign="top" ><pre>ALTER SYSTEM SET `&lt;option_name&gt;`=&lt;value&gt;;</pre></td></tr><tr><td valign="top" ><p><a href="/docs/crea
 te-table-as--ctas-command">CREATE TABLE AS<br />(CTAS)</a></p></td><td valign="top" >Creates a new table and populates the new table with rows returned from a SELECT query. Use the CREATE TABLE AS (CTAS) statement in place of INSERT INTO. When you issue the CTAS command, you create a directory that contains parquet or CSV files. Each workspace in a file system has a default file type.<br />You can specify which writer you want Drill to use when creating a table: parquet, CSV, or JSON (as specified with the <code>store.format</code> option).</td><td valign="top" ><pre class="programlisting">CREATE TABLE new_table_name AS &lt;query&gt;;</pre></td></tr><tr><td - valign="top" ><a href="/docs/create-view-command">CREATE VIEW </a></td><td - valign="top" >Creates a virtual structure for the result set of a stored query.-</td><td -valign="top" ><pre>CREATE [OR REPLACE] VIEW [workspace.]view_name [ (column_name [, ...]) ] AS &lt;query&gt;;</pre></td></tr><tr><td  valign="top" ><a href="/docs
 /describe-command">DESCRIBE</a></td><td  valign="top" >Returns information about columns in a table or view.</td><td valign="top" ><pre>DESCRIBE [workspace.]table_name|view_name</pre></td></tr><tr><td valign="top" ><a href="/docs/drop-view-command">DROP VIEW</a></td><td valign="top" >Removes a view.</td><td valign="top" ><pre>DROP VIEW [workspace.]view_name ;</pre></td></tr><tr><td  valign="top" ><a href="/docs/explain-commands">EXPLAIN PLAN FOR</a></td><td valign="top" >Returns the physical plan for a particular query.</td><td valign="top" ><pre>EXPLAIN PLAN FOR &lt;query&gt;;</pre></td></tr><tr><td valign="top" ><a href="/docs/explain-commands">EXPLAIN PLAN WITHOUT IMPLEMENTATION FOR</a></td><td valign="top" >Returns the logical plan for a particular query.</td><td  valign="top" ><pre>EXPLAIN PLAN WITHOUT IMPLEMENTATION FOR &lt;query&gt;;</pre></td></tr><tr><td colspan="1" valign="top" ><a href="/docs/select-statements" rel="nofollow">SELECT</a></td><td valign="top" >Retrieves dat
 a from tables and files.</td><td  valign="top" ><pre>[WITH subquery]<br />SELECT column_list FROM table_name <br />[WHERE clause]<br />[GROUP BY clause]<br />[HAVING clause]<br />[ORDER BY clause];</pre></td></tr><tr><td  valign="top" ><a href="/docs/show-databases-and-show-schemas-commands">SHOW DATABASES </a></td><td valign="top" >Returns a list of available schemas. Equivalent to SHOW SCHEMAS.</td><td valign="top" ><pre>SHOW DATABASES;</pre></td></tr><tr><td valign="top" ><a href="/docs/show-files-command" >SHOW FILES</a></td><td valign="top" >Returns a list of files in a file system schema.</td><td valign="top" ><pre>SHOW FILES IN filesystem.`schema_name`;<br />SHOW FILES FROM filesystem.`schema_name`;</pre></td></tr><tr><td valign="top" ><a href="/docs/show-databases-and-show-schemas-commands">SHOW SCHEMAS</a></td><td - valign="top" >Returns a list of available schemas. Equivalent to SHOW DATABASES.</td><td valign="top" ><pre>SHOW SCHEMAS;</pre></td></tr><tr><td valign="top" ><
 a href="/docs/show-tables-command">SHOW TABLES</a></td><td valign="top" >Returns a list of tables and views.</td><td valign="top" ><pre>SHOW TABLES;</pre></td></tr><tr><td valign="top" ><a href="/docs/use-command">USE</a></td><td valign="top" >Change to a particular schema. When you opt to use a particular schema, Drill issues queries on that schema only.</td><td valign="top" ><pre>USE schema_name;</pre></td></tr></table>

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/010-alter-session-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/010-alter-session-command.md b/_docs/sql-reference/sql-commands/010-alter-session-command.md
new file mode 100644
index 0000000..c3bdc86
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/010-alter-session-command.md
@@ -0,0 +1,74 @@
+---
+title: "ALTER SESSION Command"
+parent: "SQL Commands"
+---
+The ALTER SESSION command changes a system setting for the duration of a
+session. Session level settings override system level settings.
+
+## Syntax
+
+The ALTER SESSION command supports the following syntax:
+
+    ALTER SESSION SET `<option_name>`=<value>;
+
+## Parameters
+
+*option_name*  
+This is the option name as it appears in the systems table.
+
+*value*  
+A value of the type listed in the sys.options table: number, string, boolean,
+or float. Use the appropriate value type for each option that you set.
+
+## Usage Notes
+
+Use the ALTER SESSION command to set Drill query planning and execution
+options per session in a cluster. The options that you set using the ALTER
+SESSION command only apply to queries that run during the current Drill
+connection. A session ends when you quit the Drill shell. You can set any of
+the system level options at the session level.
+
+You can run the following query to see a complete list of planning and
+execution options that are currently set at the system or session level:
+
+    0: jdbc:drill:zk=local> SELECT name, type FROM sys.options WHERE type in ('SYSTEM','SESSION') order by name;
+    +------------+----------------------------------------------+
+    |   name                                       |    type    |
+    +----------------------------------------------+------------+
+    | drill.exec.functions.cast_empty_string_to_null | SYSTEM   |
+    | drill.exec.storage.file.partition.column.label | SYSTEM   |
+    | exec.errors.verbose                          | SYSTEM     |
+    | exec.java_compiler                           | SYSTEM     |
+    | exec.java_compiler_debug                     | SYSTEM     |
+    …
+    +------------+----------------------------------------------+
+
+{% include startnote.html %}This is a truncated version of the list.{% include endnote.html %}
+
+## Example
+
+This example demonstrates how to use the ALTER SESSION command to set the
+`store.json.all_text_mode` option to “true” for the current Drill session.
+Setting this option to “true” enables text mode so that Drill reads everything
+in JSON as a text object instead of trying to interpret data types. This
+allows complicated JSON to be read using CASE and CAST.
+
+    0: jdbc:drill:zk=local> alter session set `store.json.all_text_mode`= true;
+    +------------+------------+
+    |   ok  |  summary   |
+    +------------+------------+
+    | true      | store.json.all_text_mode updated. |
+    +------------+------------+
+    1 row selected (0.046 seconds)
+
+You can issue a query to see all of the session level settings. Note that the
+option type is case-sensitive.
+
+    0: jdbc:drill:zk=local> SELECT name, type, bool_val FROM sys.options WHERE type = 'SESSION' order by name;
+    +------------+------------+------------+
+    |   name    |   type    |  bool_val  |
+    +------------+------------+------------+
+    | store.json.all_text_mode | SESSION    | true      |
+    +------------+------------+------------+
+    1 row selected (0.176 seconds)
+

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/020-alter-system.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/020-alter-system.md b/_docs/sql-reference/sql-commands/020-alter-system.md
new file mode 100644
index 0000000..a351ac8
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/020-alter-system.md
@@ -0,0 +1,102 @@
+---
+title: "ALTER SYSTEM Command"
+parent: "SQL Commands"
+---
+The ALTER SYSTEM command permanently changes a system setting. The new setting
+persists across all sessions. Session level settings override system level
+settings.
+
+## Syntax
+
+The ALTER SYSTEM command supports the following syntax:
+
+    ALTER SYSTEM SET `<option_name>`=<value>;
+
+## Parameters
+
+*option_name*
+
+This is the option name as it appears in the systems table.
+
+_value_
+
+A value of the type listed in the sys.options table: number, string, boolean,
+or float. Use the appropriate value type for each option that you set.
+
+## Usage Notes
+
+Use the ALTER SYSTEM command to permanently set Drill query planning and
+execution options per cluster. Options set at the system level affect the
+entire system and persist between restarts.
+
+You can run the following query to see a complete list of planning and
+execution options that you can set at the system level:
+
+    0: jdbc:drill:zk=local> select name, type, num_val, string_val, bool_val, float_val from sys.options where type like 'SYSTEM' order by name;
+    +------------+------------+------------+------------+------------+------------+
+    |    name    |    type    |  num_val   | string_val |  bool_val  | float_val  |
+    +------------+------------+------------+------------+------------+------------+
+    | drill.exec.functions.cast_empty_string_to_null | SYSTEM     | null       | null       | false      | null       |
+    | drill.exec.storage.file.partition.column.label | SYSTEM     | null       | dir        | null       | null       |
+    | exec.errors.verbose | SYSTEM     | null       | null       | false      | null       |
+    | exec.java_compiler | SYSTEM     | null       | DEFAULT    | null       | null       |
+    | exec.java_compiler_debug | SYSTEM     | null       | null       | true       | null       |
+    | exec.java_compiler_janino_maxsize | SYSTEM     | 262144     | null       | null       | null       |
+    | exec.queue.timeout_millis | SYSTEM     | 400000     | null       | null       | null       |
+    | planner.add_producer_consumer | SYSTEM     | null       | null       | true       | null       |
+    | planner.affinity_factor | SYSTEM     | null       | null       | null       | 1.2        |
+    | planner.broadcast_threshold | SYSTEM     | 1000000    | null       | null       | null       |
+    | planner.disable_exchanges | SYSTEM     | null       | null       | false      | null       |
+    | planner.enable_broadcast_join | SYSTEM     | null       | null       | true       | null       |
+    | planner.enable_hash_single_key | SYSTEM     | null       | null       | true       | null       |
+    | planner.enable_hashagg | SYSTEM     | null       | null       | true       | null       |
+    | planner.enable_hashjoin | SYSTEM     | null       | null       | true       | null       |
+    | planner.slice_target | SYSTEM     | 100000     | null       | null       | null       |
+    | planner.width.max_per_node | SYSTEM     | 2          | null       | null       | null       |
+    | planner.width.max_per_query | SYSTEM     | 1000       | null       | null       | null       |
+    | store.format | SYSTEM     | null       | parquet    | null       | null       |
+    | store.json.all_text_mode | SYSTEM     | null       | null       | false      | null       |
+    | store.mongo.all_text_mode | SYSTEM     | null       | null       | false      | null       |
+    | store.parquet.block-size | SYSTEM     | 536870912  | null       | null       | null       |
+    | store.parquet.use_new_reader | SYSTEM     | null       | null       | false      | null       |
+    | store.parquet.vector_fill_check_threshold | SYSTEM     | 10         | null       | null       | null       |
+    | store.parquet.vector_fill_threshold | SYSTEM     | 85         | null       | null       | null       |
+    +------------+------------+------------+------------+------------+------------+
+
+{% include startnote.html %}This is a truncated version of the list.{% include endnote.html %}
+
+## Example
+
+This example demonstrates how to use the ALTER SYSTEM command to set the
+`planner.add_producer_consumer` option to “true.” This option enables a
+secondary reading thread to prefetch data from disk.
+
+    0: jdbc:drill:zk=local> alter system set `planner.add_producer_consumer` = true;
+    +------------+------------+
+    |   ok  |  summary   |
+    +------------+------------+
+    | true      | planner.add_producer_consumer updated. |
+    +------------+------------+
+    1 row selected (0.046 seconds)
+
+You can issue a query to see all of the system level settings set to “true.”
+Note that the option type is case-sensitive.
+
+    0: jdbc:drill:zk=local> SELECT name, type, bool_val FROM sys.options WHERE type = 'SYSTEM' and bool_val=true;
+    +------------+------------+------------+
+    |   name    |   type    |  bool_val  |
+    +------------+------------+------------+
+    | exec.java_compiler_debug | SYSTEM     | true      |
+    | planner.enable_mergejoin | SYSTEM     | true      |
+    | planner.enable_broadcast_join | SYSTEM    | true      |
+    | planner.enable_hashagg | SYSTEM   | true      |
+    | planner.add_producer_consumer | SYSTEM    | true      |
+    | planner.enable_hash_single_key | SYSTEM   | true      |
+    | planner.enable_multiphase_agg | SYSTEM    | true      |
+    | planner.enable_streamagg | SYSTEM     | true      |
+    | planner.enable_hashjoin | SYSTEM  | true      |
+    +------------+------------+------------+
+    9 rows selected (0.159 seconds)
+
+  
+

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/030-create-table-as-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/030-create-table-as-command.md b/_docs/sql-reference/sql-commands/030-create-table-as-command.md
new file mode 100644
index 0000000..5bab011
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/030-create-table-as-command.md
@@ -0,0 +1,134 @@
+---
+title: "CREATE TABLE AS (CTAS) command"
+parent: "SQL Commands"
+---
+You can create tables in Drill by using the CTAS command:
+
+    CREATE TABLE new_table_name AS <query>;
+
+where query is any valid Drill query. Each table you create must have a unique
+name. You can include an optional column list for the new table. For example:
+
+    create table logtable(transid, prodid) as select transaction_id, product_id from ...
+
+You can store table data in one of three formats:
+
+  * csv
+  * parquet
+  * json
+
+The parquet and json formats can be used to store complex data.
+
+To set the output format for a Drill table, set the `store.format` option with
+the ALTER SYSTEM or ALTER SESSION command. For example:
+
+    alter session set `store.format`='json';
+
+Table data is stored in the location specified by the workspace that is in use
+when you run the CTAS statement. By default, a directory is created, using the
+exact table name specified in the CTAS statement. A .json, .csv, or .parquet
+file inside that directory contains the data.
+
+You can only create new tables in workspaces. You cannot create tables in
+other storage plugins such as Hive and HBase.
+
+You must use a writable (mutable) workspace when creating Drill tables. For
+example:
+
+	"tmp": {
+	      "location": "/tmp",
+	      "writable": true,
+	       }
+
+## Example
+
+The following query returns one row from a JSON file:
+
+	0: jdbc:drill:zk=local> select id, type, name, ppu
+	from dfs.`/Users/brumsby/drill/donuts.json`;
+	+------------+------------+------------+------------+
+	|     id     |    type    |    name    |    ppu     |
+	+------------+------------+------------+------------+
+	| 0001       | donut      | Cake       | 0.55       |
+	+------------+------------+------------+------------+
+	1 row selected (0.248 seconds)
+
+To create and verify the contents of a table that contains this row:
+
+  1. Set the workspace to a writable workspace.
+  2. Set the `store.format` option appropriately.
+  3. Run a CTAS statement that contains the query.
+  4. Go to the directory where the table is stored and check the contents of the file.
+  5. Run a query against the new table.
+
+The following sqlline output captures this sequence of steps.
+
+### Workspace Definition
+
+	"tmp": {
+	      "location": "/tmp",
+	      "writable": true,
+	       }
+
+### ALTER SESSION Command
+
+    alter session set `store.format`='json';
+
+### USE Command
+
+	0: jdbc:drill:zk=local> use dfs.tmp;
+	+------------+------------+
+	|     ok     |  summary   |
+	+------------+------------+
+	| true       | Default schema changed to 'dfs.tmp' |
+	+------------+------------+
+	1 row selected (0.03 seconds)
+
+### CTAS Command
+
+	0: jdbc:drill:zk=local> create table donuts_json as
+	select id, type, name, ppu from dfs.`/Users/brumsby/drill/donuts.json`;
+	+------------+---------------------------+
+	|  Fragment  | Number of records written |
+	+------------+---------------------------+
+	| 0_0        | 1                         |
+	+------------+---------------------------+
+	1 row selected (0.107 seconds)
+
+### File Contents
+
+	administorsmbp7:tmp brumsby$ pwd
+	/tmp
+	administorsmbp7:tmp brumsby$ cd donuts_json
+	administorsmbp7:donuts_json brumsby$ more 0_0_0.json
+	{
+	 "id" : "0001",
+	  "type" : "donut",
+	  "name" : "Cake",
+	  "ppu" : 0.55
+	}
+
+### Query Against New Table
+
+	0: jdbc:drill:zk=local> select * from donuts_json;
+	+------------+------------+------------+------------+
+	|     id     |    type    |    name    |    ppu     |
+	+------------+------------+------------+------------+
+	| 0001       | donut      | Cake       | 0.55       |
+	+------------+------------+------------+------------+
+	1 row selected (0.053 seconds)
+
+### Use a Different Output Format
+
+You can run the same sequence again with a different storage format set for
+the system or session (csv or parquet). For example, if the format is set to
+csv, and you name the table donuts_csv, the resulting file would look like
+this:
+
+	administorsmbp7:tmp brumsby$ cd donuts_csv
+	administorsmbp7:donuts_csv brumsby$ ls
+	0_0_0.csv
+	administorsmbp7:donuts_csv brumsby$ more 0_0_0.csv
+	id,type,name,ppu
+	0001,donut,Cake,0.55
+

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/050-create-view-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/050-create-view-command.md b/_docs/sql-reference/sql-commands/050-create-view-command.md
new file mode 100644
index 0000000..d21ea12
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/050-create-view-command.md
@@ -0,0 +1,197 @@
+---
+title: "CREATE VIEW command"
+parent: "SQL Commands"
+---
+The CREATE VIEW command creates a virtual structure for the result set of a
+stored query. A view can combine data from multiple underlying data sources
+and provide the illusion that all of the data is from one source. You can use
+views to protect sensitive data, for data aggregation, and to hide data
+complexity from users. You can create Drill views from files in your local and
+distributed file systems, Hive, HBase, and MapR-DB tables, as well as from
+existing views or any other available storage plugin data sources.
+
+## Syntax
+
+The CREATE VIEW command supports the following syntax:
+
+    CREATE [OR REPLACE] VIEW [workspace.]view_name [ (column_name [, ...]) ] AS <query>;
+
+Use CREATE VIEW to create a new view. Use CREATE OR REPLACE VIEW to replace an
+existing view with the same name. When you replace a view, the query must
+generate the same set of columns with the same column names and data types.
+
+**Note:** Follow Drill’s rules for identifiers when you name the view. See coming soon...
+
+## Parameters
+
+_workspace_  
+The location where you want the view to exist. By default, the view is created
+in the current workspace. See
+[Workspaces]({{ site.baseurl }}/docs/Workspaces).
+
+_view_name_  
+The name that you give the view. The view must have a unique name. It cannot
+have the same name as any other view or table in the workspace.
+
+_column_name_  
+Optional list of column names in the view. If you do not supply column names,
+they are derived from the query.
+
+_query_  
+A SELECT statement that defines the columns and rows in the view.
+
+## Usage Notes
+
+### Storage
+
+Drill stores views in the location specified by the workspace that you use
+when you run the CREATE VIEW command. If the workspace is not defined, Drill
+creates the view in the current workspace. You must use a writable workspace
+when you create a view. Currently, Drill only supports views created in the
+file system or distributed file system.
+
+The following example shows a writable workspace as defined within the storage
+plugin in the `/tmp` directory of the file system:
+
+    "tmp": {
+          "location": "/tmp",
+          "writable": true,
+           }
+
+Drill stores the view definition in JSON format with the name that you specify
+when you run the CREATE VIEW command, suffixed `by .view.drill`. For example,
+if you create a view named `myview`, Drill stores the view in the designated
+workspace as `myview.view.drill`.
+
+Data Sources
+
+Drill considers data sources to have either a strong schema or a weak schema.  
+
+##### Strong Schema
+
+With the exception of text file data sources, Drill verifies that data sources
+associated with a strong schema contain data types compatible with those used
+in the query. Drill also verifies that the columns referenced in the query
+exist in the underlying data sources. If the columns do not exist, CREATE VIEW
+fails.
+
+#### Weak Schema
+
+Drill does not verify that data sources associated with a weak schema contain
+data types compatible with those used in the query. Drill does not verify if
+columns referenced in a query on a Parquet data source exist, therefore CREATE
+VIEW always succeeds. In the case of JSON files, Drill does not verify if the
+files contain the maps specified in the view.
+
+The following table lists the current categories of schema and the data
+sources associated with each:
+
+<table>
+  <tr>
+    <th></th>
+    <th>Strong Schema</th>
+    <th>Weak Schema</th>
+  </tr>
+  <tr>
+    <td valign="top">Data Sources</td>
+    <td>views<br>hive tables<br>hbase column families<br>text</td>
+    <td>json<br>mongodb<br>hbase column qualifiers<br>parquet</td>
+  </tr>
+</table>
+  
+## Related Commands
+
+After you create a view using the CREATE VIEW command, you can issue the
+following commands against the view:
+
+  * SELECT 
+  * DESCRIBE 
+  * DROP 
+
+{% include startnote.html %}You cannot update, insert into, or delete from a view.{% include endnote.html %}
+
+## Example
+
+This example shows you some steps that you can follow when you want to create
+a view in Drill using the CREATE VIEW command. A workspace named “donuts” was
+created for the steps in this example.
+
+Complete the following steps to create a view in Drill:
+
+  1. Decide which workspace you will use to create the view, and verify that the writable option is set to “true.” You can use an existing workspace, or you can create a new workspace. See [Workspaces](https://cwiki.apache.org/confluence/display/DRILL/Workspaces) for more information.  
+  
+        "workspaces": {
+           "donuts": {
+             "location": "/home/donuts",
+             "writable": true,
+             "defaultInputFormat": null
+           }
+         },
+
+  2. Run SHOW DATABASES to verify that Drill recognizes the workspace.  
+
+        0: jdbc:drill:zk=local> show databases;
+        +-------------+
+        | SCHEMA_NAME |
+        +-------------+
+        | dfs.default |
+        | dfs.root  |
+        | dfs.donuts  |
+        | dfs.tmp   |
+        | cp.default  |
+        | sys       |
+        | INFORMATION_SCHEMA |
+        +-------------+
+
+  3. Use the writable workspace.  
+
+        0: jdbc:drill:zk=local> use dfs.donuts;
+        +------------+------------+
+        |     ok    |  summary   |
+        +------------+------------+
+        | true      | Default schema changed to 'dfs.donuts' |
+        +------------+------------+
+
+  4. Test run the query that you plan to use with the CREATE VIEW command.  
+
+        0: jdbc:drill:zk=local> select id, type, name, ppu from `donuts.json`;
+        +------------+------------+------------+------------+
+        |     id    |   type    |   name    |    ppu    |
+        +------------+------------+------------+------------+
+        | 0001      | donut      | Cake     | 0.55      |
+        +------------+------------+------------+------------+
+
+  5. Run the CREATE VIEW command with the query.  
+
+        0: jdbc:drill:zk=local> create view mydonuts as select id, type, name, ppu from `donuts.json`;
+        +------------+------------+
+        |     ok    |  summary   |
+        +------------+------------+
+        | true      | View 'mydonuts' created successfully in 'dfs.donuts' schema |
+        +------------+------------+
+
+  6. Create a new view in another workspace from the current workspace.  
+
+        0: jdbc:drill:zk=local> create view dfs.tmp.yourdonuts as select id, type, name from `donuts.json`;
+        +------------+------------+
+        |   ok  |  summary   |
+        +------------+------------+
+        | true      | View 'yourdonuts' created successfully in 'dfs.tmp' schema |
+        +------------+------------+
+
+  7. Query the view created in both workspaces.
+
+        0: jdbc:drill:zk=local> select * from mydonuts;
+        +------------+------------+------------+------------+
+        |     id    |   type    |   name    |    ppu    |
+        +------------+------------+------------+------------+
+        | 0001      | donut      | Cake     | 0.55      |
+        +------------+------------+------------+------------+
+         
+         
+        0: jdbc:drill:zk=local> select * from dfs.tmp.yourdonuts;
+        +------------+------------+------------+
+        |   id  |   type    |   name    |
+        +------------+------------+------------+
+        | 0001      | donut     | Cake      |
+        +------------+------------+------------+

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/060-describe-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/060-describe-command.md b/_docs/sql-reference/sql-commands/060-describe-command.md
new file mode 100644
index 0000000..349f0ef
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/060-describe-command.md
@@ -0,0 +1,99 @@
+---
+title: "DESCRIBE Command"
+parent: "SQL Commands"
+---
+The DESCRIBE command returns information about columns in a table or view.
+
+## Syntax
+
+The DESCRIBE command supports the following syntax:
+
+    DESCRIBE [workspace.]table_name|view_name
+
+## Usage Notes
+
+You can issue the DESCRIBE command against views created in a workspace and
+tables created in Hive, HBase, and MapR-DB. You can issue the DESCRIBE command
+on a table or view from any schema. For example, if you are working in the
+`dfs.myworkspace` schema, you can issue the DESCRIBE command on a view or
+table in another schema. Currently, DESCRIBE does not support tables created
+in a file system.
+
+Drill only supports SQL data types. Verify that all data types in an external
+data source, such as Hive or HBase, map to supported data types in Drill. See
+Drill Data Type Mapping for more information.
+
+## Example
+
+The following example demonstrates the steps that you can follow when you want
+to use the DESCRIBE command to see column information for a view and for Hive
+and HBase tables.
+
+Complete the following steps to use the DESCRIBE command:
+
+  1. Issue the USE command to switch to a particular schema.
+
+        0: jdbc:drill:zk=drilldemo:5181> use hive;
+        +------------+------------+
+        |   ok  |  summary   |
+        +------------+------------+
+        | true      | Default schema changed to 'hive' |
+        +------------+------------+
+        1 row selected (0.025 seconds)
+
+  2. Issue the SHOW TABLES command to see the existing tables in the schema.
+
+        0: jdbc:drill:zk=drilldemo:5181> show tables;
+        +--------------+------------+
+        | TABLE_SCHEMA | TABLE_NAME |
+        +--------------+------------+
+        | hive.default | orders     |
+        | hive.default | products   |
+        +--------------+------------+
+        2 rows selected (0.438 seconds)
+
+  3. Issue the DESCRIBE command on a table.
+
+        0: jdbc:drill:zk=drilldemo:5181> describe orders;
+        +-------------+------------+-------------+
+        | COLUMN_NAME | DATA_TYPE  | IS_NULLABLE |
+        +-------------+------------+-------------+
+        | order_id  | BIGINT    | YES       |
+        | month     | VARCHAR   | YES       |
+        | purchdate   | TIMESTAMP  | YES        |
+        | cust_id   | BIGINT    | YES       |
+        | state     | VARCHAR   | YES       |
+        | prod_id   | BIGINT    | YES       |
+        | order_total | INTEGER | YES       |
+        +-------------+------------+-------------+
+        7 rows selected (0.64 seconds)
+
+  4. Issue the DESCRIBE command on a table in another schema from the current schema.
+
+        0: jdbc:drill:zk=drilldemo:5181> describe hbase.customers;
+        +-------------+------------+-------------+
+        | COLUMN_NAME | DATA_TYPE  | IS_NULLABLE |
+        +-------------+------------+-------------+
+        | row_key   | ANY       | NO        |
+        | address   | (VARCHAR(1), ANY) MAP | NO        |
+        | loyalty   | (VARCHAR(1), ANY) MAP | NO        |
+        | personal  | (VARCHAR(1), ANY) MAP | NO        |
+        +-------------+------------+-------------+
+        4 rows selected (0.671 seconds)
+
+  5. Issue the DESCRIBE command on a view in another schema from the current schema.
+
+        0: jdbc:drill:zk=drilldemo:5181> describe dfs.views.customers_vw;
+        +-------------+------------+-------------+
+        | COLUMN_NAME | DATA_TYPE  | IS_NULLABLE |
+        +-------------+------------+-------------+
+        | cust_id   | BIGINT    | NO        |
+        | name      | VARCHAR   | NO        |
+        | address   | VARCHAR   | NO        |
+        | gender    | VARCHAR   | NO        |
+        | age       | VARCHAR   | NO        |
+        | agg_rev   | VARCHAR   | NO        |
+        | membership  | VARCHAR | NO        |
+        +-------------+------------+-------------+
+        7 rows selected (0.403 seconds)
+

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/070-explain-commands.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/070-explain-commands.md b/_docs/sql-reference/sql-commands/070-explain-commands.md
new file mode 100644
index 0000000..5aab0e9
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/070-explain-commands.md
@@ -0,0 +1,156 @@
+---
+title: "EXPLAIN commands"
+parent: "SQL Commands"
+---
+EXPLAIN is a useful tool for examining the steps that a query goes through
+when it is executed. You can use the EXPLAIN output to gain a deeper
+understanding of the parallel processing that Drill queries exploit. You can
+also look at costing information, troubleshoot performance issues, and
+diagnose routine errors that may occur when you run queries.
+
+Drill provides two variations on the EXPLAIN command, one that returns the
+physical plan and one that returns the logical plan. A logical plan takes the
+SQL query (as written by the user and accepted by the parser) and translates
+it into a logical series of operations that correspond to SQL language
+constructs (without defining the specific algorithms that will be implemented
+to run the query). A physical plan translates the logical plan into a specific
+series of steps that will be used when the query runs. For example, a logical
+plan may indicate a join step in general and classify it as inner or outer,
+but the corresponding physical plan will indicate the specific type of join
+operator that will run, such as a merge join or a hash join. The physical plan
+is operational and reveals the specific _access methods_ that will be used for
+the query.
+
+An EXPLAIN command for a query that is run repeatedly under the exact same
+conditions against the same data will return the same plan. However, if you
+change a configuration option, for example, or update the tables or files that
+you are selecting from, you are likely to see plan changes.
+
+## EXPLAIN Syntax
+
+The EXPLAIN command supports the following syntax:
+
+    explain plan [ including all attributes ] [ with implementation | without implementation ] for <query> ;
+
+where `query` is any valid SELECT statement supported by Drill.
+
+##### INCLUDING ALL ATTRIBUTES
+
+This option returns costing information. You can use this option for both
+physical and logical plans.
+
+#### WITH IMPLEMENTATION | WITHOUT IMPLEMENTATION
+
+These options return the physical and logical plan information, respectively.
+The default is physical (WITH IMPLEMENTATION).
+
+## EXPLAIN for Physical Plans
+
+The EXPLAIN PLAN FOR <query> command returns the chosen physical execution
+plan for a query statement without running the query. You can use this command
+to see what kind of execution operators Drill implements. For example, you can
+find out what kind of join algorithm is chosen when tables or files are
+joined. You can also use this command to analyze errors and troubleshoot
+queries that do not run. For example, if you run into a casting error, the
+query plan text may help you isolate the problem.
+
+Use the following syntax:
+
+    explain plan for <query> ;
+
+The following set command increases the default text display (number of
+characters). By default, most of the plan output is not displayed.
+
+    0: jdbc:drill:zk=local> !set maxwidth 10000
+
+Do not use a semicolon to terminate set commands.
+
+For example, here is the top portion of the explain output for a
+COUNT(DISTINCT) query on a JSON file:
+
+    0: jdbc:drill:zk=local> !set maxwidth 10000
+	0: jdbc:drill:zk=local> explain plan for select type t, count(distinct id) from dfs.`/home/donuts/donuts.json` where type='donut' group by type;
+	+------------+------------+
+	|   text    |   json    |
+	+------------+------------+
+	| 00-00 Screen
+	00-01   Project(t=[$0], EXPR$1=[$1])
+	00-02       Project(t=[$0], EXPR$1=[$1])
+	00-03       HashAgg(group=[{0}], EXPR$1=[COUNT($1)])
+	00-04           HashAgg(group=[{0, 1}])
+	00-05           SelectionVectorRemover
+	00-06               Filter(condition=[=($0, 'donut')])
+	00-07               Scan(groupscan=[EasyGroupScan [selectionRoot=/home/donuts/donuts.json, numFiles=1, columns=[`type`, `id`], files=[file:/home/donuts/donuts.json]]])...
+	...
+
+Read the text output from bottom to top to understand the sequence of
+operators that will execute the query. Note that the physical plan starts with
+a scan of the JSON file that is being queried. The selected columns are
+projected and filtered, then the aggregate function is applied.
+
+The EXPLAIN text output is followed by detailed JSON output, which is reusable
+for submitting the query via Drill APIs.
+
+	| {
+	  "head" : {
+	    "version" : 1,
+	    "generator" : {
+	      "type" : "ExplainHandler",
+	      "info" : ""
+	    },
+	    "type" : "APACHE_DRILL_PHYSICAL",
+	    "options" : [ ],
+	    "queue" : 0,
+	    "resultMode" : "EXEC"
+	  },
+	....
+
+## Costing Information
+
+Add the INCLUDING ALL ATTRIBUTES option to the EXPLAIN command to see cost
+estimates for the query plan. For example:
+
+	0: jdbc:drill:zk=local> !set maxwidth 10000
+	0: jdbc:drill:zk=local> explain plan including all attributes for select * from dfs.`/home/donuts/donuts.json` where type='donut';
+	+------------+------------+
+	|   text    |   json    |
+	+------------+------------+
+	| 00-00 Screen: rowcount = 1.0, cumulative cost = {5.1 rows, 21.1 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 889
+	00-01   Project(*=[$0]): rowcount = 1.0, cumulative cost = {5.0 rows, 21.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 888
+	00-02       Project(T1¦¦*=[$0]): rowcount = 1.0, cumulative cost = {4.0 rows, 17.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 887
+	00-03       SelectionVectorRemover: rowcount = 1.0, cumulative cost = {3.0 rows, 13.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 886
+	00-04           Filter(condition=[=($1, 'donut')]): rowcount = 1.0, cumulative cost = {2.0 rows, 12.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 885
+	00-05           Project(T1¦¦*=[$0], type=[$1]): rowcount = 1.0, cumulative cost = {1.0 rows, 8.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 884
+	00-06               Scan(groupscan=[EasyGroupScan [selectionRoot=/home/donuts/donuts.json, numFiles=1, columns=[`*`], files=[file:/home/donuts/donuts.json]]]): rowcount = 1.0, cumulative cost = {0.0 rows, 0.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 883
+
+## EXPLAIN for Logical Plans
+
+To return the logical plan for a query (again, without actually running the
+query), use the EXPLAIN PLAN WITHOUT IMPLEMENTATION syntax:
+
+    explain plan without implementation for <query> ;
+
+For example:
+
+	0: jdbc:drill:zk=local> explain plan without implementation for select type t, count(distinct id) from dfs.`/home/donuts/donuts.json` where type='donut' group by type;
+	+------------+------------+
+	|   text    |   json    |
+	+------------+------------+
+	| DrillScreenRel
+	  DrillProjectRel(t=[$0], EXPR$1=[$1])
+	    DrillAggregateRel(group=[{0}], EXPR$1=[COUNT($1)])
+	    DrillAggregateRel(group=[{0, 1}])
+	        DrillFilterRel(condition=[=($0, 'donut')])
+	        DrillScanRel(table=[[dfs, /home/donuts/donuts.json]], groupscan=[EasyGroupScan [selectionRoot=/home/donuts/donuts.json, numFiles=1, columns=[`type`, `id`], files=[file:/home/donuts/donuts.json]]]) | {
+	  | {
+	  "head" : {
+	    "version" : 1,
+	    "generator" : {
+	    "type" : "org.apache.drill.exec.planner.logical.DrillImplementor",
+	    "info" : ""
+	    },
+	    "type" : "APACHE_DRILL_LOGICAL",
+	    "options" : null,
+	    "queue" : 0,
+	    "resultMode" : "LOGICAL"
+	  },...

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/080-select.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/080-select.md b/_docs/sql-reference/sql-commands/080-select.md
new file mode 100644
index 0000000..4fb9f5e
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/080-select.md
@@ -0,0 +1,178 @@
+---
+title: "SELECT Statements"
+parent: "SQL Commands"
+---
+Drill supports the following ANSI standard clauses in the SELECT statement:
+
+  * WITH clause
+  * SELECT list
+  * FROM clause
+  * WHERE clause
+  * GROUP BY clause
+  * HAVING clause
+  * ORDER BY clause (with an optional LIMIT clause)
+
+You can use the same SELECT syntax in the following commands:
+
+  * CREATE TABLE AS (CTAS)
+  * CREATE VIEW
+
+INSERT INTO SELECT is not yet supported.
+
+## Column Aliases
+
+You can use named column aliases in the SELECT list to provide meaningful
+names for regular columns and computed columns, such as the results of
+aggregate functions. See the section on running queries for examples.
+
+You cannot reference column aliases in the following clauses:
+
+  * WHERE
+  * GROUP BY
+  * HAVING
+
+Because Drill works with schema-less data sources, you cannot use positional
+aliases (1, 2, etc.) to refer to SELECT list columns, except in the ORDER BY
+clause.
+
+## UNION ALL Set Operator
+
+Drill supports the UNION ALL set operator to combine two result sets. The
+distinct UNION operator is not yet supported.
+
+The EXCEPT, EXCEPT ALL, INTERSECT, and INTERSECT ALL operators are not yet
+supported.
+
+## Joins
+
+Drill supports ANSI standard joins in the FROM and WHERE clauses:
+
+  * Inner joins
+  * Left, full, and right outer joins
+
+The following types of join syntax are supported:
+
+Join type| Syntax  
+---|---  
+Join condition in WHERE clause|FROM table1, table 2 WHERE table1.col1=table2.col1  
+USING join in FROM clause|FROM table1 JOIN table2 USING(col1, ...)  
+ON join in FROM clause|FROM table1 JOIN table2 ON table1.col1=table2.col1  
+NATURAL JOIN in FROM clause|FROM table 1 NATURAL JOIN table 2  
+
+Cross-joins are not yet supported. You must specify a join condition when more
+than one table is listed in the FROM clause.
+
+Non-equijoins are supported if the join also contains an equality condition on
+the same two tables as part of a conjunction:
+
+    table1.col1 = table2.col1 AND table1.c2 < table2.c2
+
+This restriction applies to both inner and outer joins.
+
+## Subqueries
+
+You can use the following subquery operators in Drill queries. These operators
+all return Boolean results.
+
+  * ALL
+  * ANY
+  * EXISTS
+  * IN
+  * SOME
+
+In general, correlated subqueries are supported. EXISTS and NOT EXISTS
+subqueries that do not contain a correlation join are not yet supported.
+
+## WITH Clause
+
+The WITH clause is an optional clause used to contain one or more common table
+expressions (CTE) where each CTE defines a temporary table that exists for the
+duration of the query. Each subquery in the WITH clause specifies a table
+name, an optional list of column names, and a SELECT statement.
+
+## Syntax
+
+The WITH clause supports the following syntax:
+
+    [ WITH with_subquery [, ...] ]
+    where with_subquery is:
+    with_subquery_table_name [ ( column_name [, ...] ) ] AS ( query ) 
+
+## Parameters
+
+_with_subquery_table_name_
+
+A unique name for a temporary table that defines the results of a WITH clause
+subquery. You cannot use duplicate names within a single WITH clause. You must
+give each subquery a table name that can be referenced in the FROM clause.
+
+_column_name_
+
+An optional list of output column names for the WITH clause subquery,
+separated by commas. The number of column names specified must be equal to or
+less than the number of columns defined by the subquery.
+
+_query_
+
+Any SELECT query that Drill supports. See
+[SELECT]({{ site.baseurl }}/docs/SELECT+Statements).
+
+## Usage Notes
+
+Use the WITH clause to efficiently define temporary tables that Drill can
+access throughout the execution of a single query. The WITH clause is
+typically a simpler alternative to using subqueries in the main body of the
+SELECT statement. In some cases, Drill can evaluate a WITH subquery once and
+reuse the results for query optimization.
+
+You can use a WITH clause in the following SQL statements:
+
+  * SELECT (including subqueries within SELECT statements)
+
+  * CREATE TABLE AS
+
+  * CREATE VIEW
+
+  * EXPLAIN
+
+You can reference the temporary tables in the FROM clause of the query. If the
+FROM clause does not reference any tables defined by the WITH clause, Drill
+ignores the WITH clause and executes the query as normal.
+
+Drill can only reference a table defined by a WITH clause subquery in the
+scope of the SELECT query that the WITH clause begins. For example, you can
+reference such a table in the FROM clause of a subquery in the SELECT list,
+WHERE clause, or HAVING clause. You cannot use a WITH clause in a subquery and
+reference its table in the FROM clause of the main query or another subquery.
+
+You cannot specify another WITH clause inside a WITH clause subquery.
+
+For example, the following query includes a forward reference to table t2 in
+the definition of table t1:
+
+## Example
+
+The following example shows the WITH clause used to create a WITH query named
+`emp_data` that selects all of the rows from the `employee.json` file. The
+main query selects the `full_name, position_title, salary`, and `hire_date`
+rows from the `emp_data` temporary table (created from the WITH subquery) and
+orders the results by the hire date. The `emp_data` table only exists for the
+duration of the query.
+
+**Note:** The `employee.json` file is included with the Drill installation. It is located in the `cp.default` workspace which is configured by default. 
+
+    0: jdbc:drill:zk=local> with emp_data as (select * from cp.`employee.json`) select full_name, position_title, salary, hire_date from emp_data order by hire_date limit 10;
+    +------------------+-------------------------+------------+-----------------------+
+    | full_name        | position_title          |   salary   | hire_date             |
+    +------------------+-------------------------+------------+-----------------------+
+    | Bunny McCown     | Store Assistant Manager | 8000.0     | 1993-05-01 00:00:00.0 |
+    | Danielle Johnson | Store Assistant Manager | 8000.0     | 1993-05-01 00:00:00.0 |
+    | Dick Brummer     | Store Assistant Manager | 7900.0     | 1993-05-01 00:00:00.0 |
+    | Gregory Whiting  | Store Assistant Manager | 10000.0    | 1993-05-01 00:00:00.0 |
+    | Juanita Sharp    | HQ Human Resources      | 6700.0     | 1994-01-01 00:00:00.0 |
+    | Sheri Nowmer     | President               | 80000.0    | 1994-12-01 00:00:00.0 |
+    | Rebecca Kanagaki | VP Human Resources      | 15000.0    | 1994-12-01 00:00:00.0 |
+    | Shauna Wyro      | Store Manager           | 15000.0    | 1994-12-01 00:00:00.0 |
+    | Roberta Damstra  | VP Information Systems  | 25000.0    | 1994-12-01 00:00:00.0 |
+    | Pedro Castillo   | VP Country Manager      | 35000.0    | 1994-12-01 00:00:00.0 |
+    +------------+----------------+--------------+------------------------------------+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/090-show-databases-and-show-schemas.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/090-show-databases-and-show-schemas.md b/_docs/sql-reference/sql-commands/090-show-databases-and-show-schemas.md
new file mode 100644
index 0000000..c000f32
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/090-show-databases-and-show-schemas.md
@@ -0,0 +1,59 @@
+---
+title: "SHOW DATABASES AND SHOW SCHEMAS Command"
+parent: "SQL Commands"
+---
+The SHOW DATABASES and SHOW SCHEMAS commands generate a list of available Drill schemas that you can query.
+
+## Syntax
+
+The SHOW DATABASES and SHOW SCHEMAS commands support the following syntax:
+
+    SHOW DATABASES;
+    SHOW SCHEMAS;
+
+{% include startnote.html %}These commands generate the same results.{% include endnote.html %}
+
+## Usage Notes
+
+You may want to run the SHOW DATABASES or SHOW SCHEMAS command to see a list of the configured storage plugins and workspaces in Drill before you issue the USE command to switch to a particular schema for your queries.
+
+In Drill, a database or schema is a configured storage plugin instance or a configured storage plugin instance with a configured workspace. For example, dfs.donuts where dfs is the file system configured as a storage plugin instance, and donuts is a configured workspace.
+
+You can configure and use multiple storage plugins and workspaces in Drill.  See [Storage Plugin Registration]({{ site.baseurl }}/docs/storage-plugin-registration) and [Workspaces]({{ site.baseurl }}/docs/workspaces).
+
+## Example
+
+The following example uses the SHOW DATABASES and SHOW SCHEMAS commands to generate a list of the available schemas in Drill. Some of the results that display are specific to all Drill installations, such as `cp.default` and `dfs.default`, while others vary based on your specific storage plugin and workspace configurations.
+
+	0: jdbc:drill:zk=local> show databases;
+	+-------------+
+	| SCHEMA_NAME |
+	+-------------+
+	| dfs.default |
+	| dfs.root  |
+	| dfs.donuts  |
+	| dfs.tmp   |
+	| dfs.customers |
+	| dfs.yelp  |
+	| cp.default  |
+	| sys       |
+	| INFORMATION_SCHEMA |
+	+-------------+
+	9 rows selected (0.07 seconds)
+	 
+	 
+	0: jdbc:drill:zk=local> show schemas;
+	+-------------+
+	| SCHEMA_NAME |
+	+-------------+
+	| dfs.default |
+	| dfs.root  |
+	| dfs.donuts  |
+	| dfs.tmp   |
+	| dfs.customers |
+	| dfs.yelp  |
+	| cp.default  |
+	| sys       |
+	| INFORMATION_SCHEMA |
+	+-------------+
+	9 rows selected (0.058 seconds)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/100-show-files.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/100-show-files.md b/_docs/sql-reference/sql-commands/100-show-files.md
new file mode 100644
index 0000000..9651add
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/100-show-files.md
@@ -0,0 +1,65 @@
+---
+title: "SHOW FILES Command"
+parent: "SQL Commands"
+---
+The SHOW FILES command provides a quick report of the file systems that are
+visible to Drill for query purposes. This command is unique to Apache Drill.
+
+## Syntax
+
+The SHOW FILES command supports the following syntax.
+
+    SHOW FILES [ FROM filesystem.directory_name | IN filesystem.directory_name ];
+
+The FROM or IN clause is required if you do not specify a default file system
+first. You can do this with the USE command. FROM and IN are synonyms.
+
+The directory name is optional. (If the directory name is a Drill reserved
+word, you must use back ticks around the name.)
+
+The command returns standard Linux `stat` information for each file or
+directory, such as permissions, owner, and group values. This information is
+not specific to Drill.
+
+## Examples
+
+The following example returns information about directories and files in the
+local (`dfs`) file system.
+
+	0: jdbc:drill:> use dfs;
+	 
+	+------------+------------+
+	|     ok     |  summary   |
+	+------------+------------+
+	| true       | Default schema changed to 'dfs' |
+	+------------+------------+
+	1 row selected (0.318 seconds)
+	 
+	0: jdbc:drill:> show files;
+	+------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
+	|    name    | isDirectory |   isFile   |   length   |   owner    |   group    | permissions | accessTime | modificationTime |
+	+------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
+	| user       | true        | false      | 1          | mapr       | mapr       | rwxr-xr-x   | 2014-07-30 21:37:06.0 | 2014-07-31 22:15:53.193 |
+	| backup.tgz | false       | true       | 36272      | root       | root       | rw-r--r--   | 2014-07-31 22:09:13.0 | 2014-07-31 22:09:13.211 |
+	| JSON       | true        | false      | 1          | root       | root       | rwxr-xr-x   | 2014-07-31 15:22:42.0 | 2014-08-04 15:43:07.083 |
+	| scripts    | true        | false      | 3          | root       | root       | rwxr-xr-x   | 2014-07-31 22:10:51.0 | 2014-08-04 18:23:09.236 |
+	| temp       | true        | false      | 2          | root       | root       | rwxr-xr-x   | 2014-08-01 20:07:37.0 | 2014-08-01 20:09:42.595 |
+	| hbase      | true        | false      | 10         | mapr       | mapr       | rwxr-xr-x   | 2014-07-30 21:36:08.0 | 2014-08-04 18:31:13.778 |
+	| tables     | true        | false      | 0          | root       | root       | rwxrwxrwx   | 2014-07-31 22:14:35.0 | 2014-08-04 15:42:43.415 |
+	| CSV        | true        | false      | 4          | root       | root       | rwxrwxrwx   | 2014-07-31 17:34:53.0 | 2014-08-04
+	...
+
+The following example shows the files in a specific directory in the `dfs`
+file system:
+
+	0: jdbc:drill:> show files in dfs.CSV;
+	 
+	+------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
+	|    name    | isDirectory |   isFile   |   length   |   owner    |   group    | permissions | accessTime | modificationTime |
+	+------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
+	| customers.csv | false       | true       | 62011      | root       | root       | rw-r--r--   | 2014-08-04 18:30:39.0 | 2014-08-04 18:30:39.314 |
+	| products.csv.small | false       | true       | 34972      | root       | root       | rw-r--r--   | 2014-07-31 23:58:42.0 | 2014-07-31 23:59:16.849 |
+	| products.csv | false       | true       | 34972      | root       | root       | rw-r--r--   | 2014-08-01 06:39:34.0 | 2014-08-04 15:58:09.325 |
+	| products.csv.bad | false       | true       | 62307      | root       | root       | rw-r--r--   | 2014-08-04 15:58:02.0 | 2014-08-04 15:58:02.612 |
+	+------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
+	4 rows selected (0.165 seconds)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/110-show-tables-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/110-show-tables-command.md b/_docs/sql-reference/sql-commands/110-show-tables-command.md
new file mode 100644
index 0000000..560bde4
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/110-show-tables-command.md
@@ -0,0 +1,136 @@
+---
+title: "SHOW TABLES Command"
+parent: "SQL Commands"
+---
+The SHOW TABLES command returns a list of views created within a schema. It
+also returns the tables that exist in Hive, HBase, and MapR-DB when you have
+these data sources configured as storage plugin instances. See[ Storage Plugin
+Registration]({{ site.baseurl }}/docs/storage-plugin-registration).
+
+## Syntax
+
+The SHOW TABLES command supports the following syntax:
+
+    SHOW TABLES;
+
+## Usage Notes
+
+First issue the USE command to identify the schema for which you want to view
+tables or views. For example, the following USE statement tells Drill that you
+only want information from the `dfs.myviews` schema:
+
+    USE dfs.myviews;
+
+In this example, “`myviews`” is a workspace created withing an instance of the
+`dfs` storage plugin.
+
+When you use a particular schema and then issue the SHOW TABLES command, Drill
+returns the tables and views within that schema.
+
+#### Limitations
+
+  * You can create and query tables within the file system, however Drill does not return these tables when you issue the SHOW TABLES command. You can issue the [SHOW FILES ]({{ site.baseurl }}/docs/show-files-command)command to see a list of all files, tables, and views, including those created in Drill. 
+
+  * You cannot create Hive, HBase, or MapR-DB tables in Drill. 
+
+## Examples
+
+The following examples demonstrate the steps that you can follow when you want
+to issue the SHOW TABLES command on the file system, Hive, and HBase.  
+  
+Complete the following steps to see views that exist in a file system and
+tables that exist in Hive and HBase data sources:
+
+  1. Issue the SHOW SCHEMAS command to see a list of available schemas.
+
+        0: jdbc:drill:zk=drilldemo:5181> show schemas;
+        +-------------+
+        | SCHEMA_NAME |
+        +-------------+
+        | hive.default |
+        | dfs.reviews |
+        | dfs.flatten |
+        | dfs.default |
+        | dfs.root  |
+        | dfs.logs  |
+        | dfs.myviews   |
+        | dfs.clicks  |
+        | dfs.tmp   |
+        | sys       |
+        | hbase     |
+        | INFORMATION_SCHEMA |
+        | s3.twitter  |
+        | s3.reviews  |
+        | s3.default  |
+        +-------------+
+        15 rows selected (0.072 seconds)
+
+  2. Issue the USE command to switch to a particular schema. When you use a particular schema, Drill searches or queries within that schema only. 
+
+        0: jdbc:drill:zk=drilldemo:5181> use dfs.myviews;
+        +------------+------------+
+        |   ok  |  summary   |
+        +------------+------------+
+        | true      | Default schema changed to 'dfs.myviews' |
+        +------------+------------+
+        1 row selected (0.025 seconds)
+
+  3. Issue the SHOW TABLES command to see the views or tables that exist within workspace.
+
+        0: jdbc:drill:zk=drilldemo:5181> show tables;
+        +--------------+------------+
+        | TABLE_SCHEMA | TABLE_NAME |
+        +--------------+------------+
+        | dfs.myviews   | logs_vw   |
+        | dfs.myviews   | customers_vw |
+        | dfs.myviews   | s3_review_vw |
+        | dfs.myviews   | clicks_vw  |
+        | dfs.myviews   | nestedclickview |
+        | dfs.myviews   | s3_user_vw |
+        | dfs.myviews   | s3_bus_vw  |
+        +--------------+------------+
+        7 rows selected (0.499 seconds)
+        0: jdbc:drill:zk=drilldemo:5181>
+
+  4. Switch to the Hive schema and issue the SHOW TABLES command to see the Hive tables that exist.
+
+        0: jdbc:drill:zk=drilldemo:5181> use hive;
+        +------------+------------+
+        |   ok  |  summary   |
+        +------------+------------+
+        | true      | Default schema changed to 'hive' |
+        +------------+------------+
+        1 row selected (0.043 seconds)
+         
+        0: jdbc:drill:zk=drilldemo:5181> show tables;
+        +--------------+------------+
+        | TABLE_SCHEMA | TABLE_NAME |
+        +--------------+------------+
+        | hive.default | orders     |
+        | hive.default | products   |
+        +--------------+------------+
+        2 rows selected (0.552 seconds)
+
+  5. Switch to the HBase schema and issue the SHOW TABLES command to see the HBase tables that exist within the schema.
+
+        0: jdbc:drill:zk=drilldemo:5181> use hbase;
+        +------------+------------+
+        |   ok  |  summary   |
+        +------------+------------+
+        | true      | Default schema changed to 'hbase' |
+        +------------+------------+
+        1 row selected (0.043 seconds)
+         
+         
+        0: jdbc:drill:zk=drilldemo:5181> show tables;
+        +--------------+------------+
+        | TABLE_SCHEMA | TABLE_NAME |
+        +--------------+------------+
+        | hbase     | customers  |
+        +--------------+------------+
+        1 row selected (0.412 seconds)
+
+  
+
+  
+

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands/120-use-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands/120-use-command.md b/_docs/sql-reference/sql-commands/120-use-command.md
new file mode 100644
index 0000000..b1bc24a
--- /dev/null
+++ b/_docs/sql-reference/sql-commands/120-use-command.md
@@ -0,0 +1,170 @@
+---
+title: "USE Command"
+parent: "SQL Commands"
+---
+The USE command changes the schema context to the specified schema. When you
+issue the USE command to switch to a particular schema, Drill queries that
+schema only.
+
+## Syntax
+
+The USE command supports the following syntax:
+
+    USE schema_name;
+
+## Parameters
+
+_schema_name_  
+A unique name for a Drill schema. A schema in Drill is a configured storage
+plugin, such as hive, or a storage plugin and workspace. For example,
+`dfs.donuts` where `dfs` is an instance of the file system configured as a
+storage plugin, and `donuts` is a workspace configured to point to a directory
+within the file system. You can configure and use multiple storage plugins and
+workspaces in Drill. See [Storage Plugin Registration]({{ site.baseurl }}/docs/storage-plugin-registration) and
+[Workspaces]({{ site.baseurl }}/docs/Workspaces).
+
+## Usage Notes
+
+Issue the USE command to change to a particular schema. When you use a schema,
+you do not have to include the full path to a file or table in your query.  
+  
+For example, to query a file named `donuts.json` in the
+`/users/max/drill/json/` directory, you must include the full file path in
+your query if you do not use a defined workspace
+
+    SELECT * FROM dfs.`/users/max/drill/json/donuts.json` WHERE type='frosted';
+
+If you create a schema that points to the `~/json` directory where the file is
+located and then use the schema, you can issue the query without explicitly
+stating the file path:
+
+    USE dfs.json;  
+    SELECT * FROM `donuts.json`WHERE type='frosted';
+
+If you do not use a schema before querying a table, you must use absolute
+notation, such as `[schema.]table[.column]`, to query the table. If you switch
+to the schema where the table exists, you can just specify the table name in
+the query. For example, to query a table named "`products`" in the `hive`
+schema, tell Drill to use the hive schema and then issue your query with the
+table name only:
+
+    USE hive;  
+    SELECT * FROM products limit 5;   
+  
+Before you issue the USE command, you may want to run SHOW DATABASES or SHOW
+SCHEMAS to see a list of the configured storage plugins and workspaces.
+
+## Example
+
+This example demonstrates how to use a file system and a hive schema to query
+a file and table in Drill.  
+  
+Issue the SHOW DATABASES or SHOW SCHEMAS command to see a list of the
+available schemas that you can use. Both commands return the same results.
+
+    0: jdbc:drill:zk=drilldemo:5181> show schemas;
+    +-------------+
+    | SCHEMA_NAME |
+    +-------------+
+    | hive.default |
+    | dfs.reviews |
+    | dfs.flatten |
+    | dfs.default |
+    | dfs.root    |
+    | dfs.logs    |
+    | dfs.myviews   |
+    | dfs.clicks  |
+    | dfs.tmp     |
+    | sys         |
+    | hbase       |
+    | INFORMATION_SCHEMA |
+    | s3.twitter  |
+    | s3.reviews  |
+    | s3.default  |
+    +-------------+
+    15 rows selected (0.059 seconds)
+
+
+Issue the USE command with the schema that you want Drill to query.  
+**Note:** If you use any of the Drill default schemas, such as `cp.default` or `dfs.default`, do not include .`default`. For example, if you want Drill to issue queries on files in its classpath, you can issue the following command:
+
+    0: jdbc:drill:zk=local> use cp;
+    +------------+------------+
+    |     ok     |  summary   |
+    +------------+------------+
+    | true       | Default schema changed to 'cp' |
+    +------------+------------+
+    1 row selected (0.04 seconds)
+
+Issue the USE command with a file system schema.
+
+    0: jdbc:drill:zk=drilldemo:5181> use dfs.logs;
+    +------------+------------+
+    |     ok     |  summary   |
+    +------------+------------+
+    | true       | Default schema changed to 'dfs.logs' |
+    +------------+------------+
+    1 row selected (0.054 seconds)
+
+You can issue the SHOW FILES command to view the files and directories within
+the schema.
+
+    0: jdbc:drill:zk=drilldemo:5181> show files;
+    +------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
+    |    name    | isDirectory |   isFile   |   length   |   owner    |   group    | permissions | accessTime | modificationTime |
+    +------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
+    | csv        | true        | false      | 1          | mapr       | mapr       | rwxrwxr-x   | 2015-02-09 06:49:17.0 | 2015-02-09 06:50:11.172 |
+    | logs       | true        | false      | 3          | mapr       | mapr       | rwxrwxr-x   | 2014-12-16 18:58:26.0 | 2014-12-16 18:58:27.223 |
+    +------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
+    2 rows selected (0.156 seconds)
+
+Query a file or directory in the file system schema.
+
+    0: jdbc:drill:zk=drilldemo:5181> select * from logs limit 5;
+    +------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+
+    |    dir0    |    dir1    |  trans_id  |    date    |    time    |  cust_id   |   device   |   state    |  camp_id   |  keywords  |  prod_id   | purch_flag |
+    +------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+
+    | 2014       | 8          | 24181      | 08/02/2014 | 09:23:52   | 0          | IOS5       | il         | 2          | wait       | 128        | false      |
+    | 2014       | 8          | 24195      | 08/02/2014 | 07:58:19   | 243        | IOS5       | mo         | 6          | hmm        | 107        | false      |
+    | 2014       | 8          | 24204      | 08/01/2014 | 12:10:27   | 12048      | IOS6       | il         | 1          | marge      | 324        | false      |
+    | 2014       | 8          | 24222      | 08/02/2014 | 16:28:37   | 2488       | IOS6       | pa         | 2          | to         | 391        | false      |
+    | 2014       | 8          | 24227      | 08/02/2014 | 07:14:00   | 154687     | IOS5       | wa         | 2          | on         | 376        | false      |
+    +------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+------------+
+
+Issue the USE command to switch to the hive schema.
+
+    0: jdbc:drill:zk=drilldemo:5181> use hive;
+    +------------+------------+
+    |     ok     |  summary   |
+    +------------+------------+
+    | true       | Default schema changed to 'hive' |
+    +------------+------------+
+    1 row selected (0.093 seconds)
+
+Issue the SHOW TABLES command to see the tables that exist within the schema.
+
+    0: jdbc:drill:zk=drilldemo:5181> show tables;
+    +--------------+------------+
+    | TABLE_SCHEMA | TABLE_NAME |
+    +--------------+------------+
+    | hive.default | orders     |
+    | hive.default | products   |
+    +--------------+------------+
+    2 rows selected (0.421 seconds)
+
+Query a table within the schema.
+
+    0: jdbc:drill:zk=drilldemo:5181> select * from products limit 5;
+    +------------+------------+------------+------------+
+    |  prod_id   |    name    |  category  |   price    |
+    +------------+------------+------------+------------+
+    | 0          | Sony notebook | laptop     | 959        |
+    | 1          | #10-4 1/8 x 9 1/2 Premium Diagonal Seam Envelopes | Envelopes  | 16         |
+    | 2          | #10- 4 1/8 x 9 1/2 Recycled Envelopes | Envelopes  | 9          |
+    | 3          | #10- 4 1/8 x 9 1/2 Security-Tint Envelopes | Envelopes  | 8          |
+    | 4          | #10 Self-Seal White Envelopes | Envelopes  | 11         |
+    +------------+------------+------------+------------+
+    5 rows selected (0.211 seconds)
+
+  
+


[35/50] [abbrv] drill git commit: switch footnote order

Posted by ts...@apache.org.
switch footnote order


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

Branch: refs/heads/gh-pages
Commit: 3f4d05ba5ef52e2697f951b73e58edb96d418d39
Parents: 0d62e54
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 13:31:27 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 13:31:27 2015 -0700

----------------------------------------------------------------------
 .../data-types/010-supported-data-types.md              | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/3f4d05ba/_docs/sql-reference/data-types/010-supported-data-types.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/data-types/010-supported-data-types.md b/_docs/sql-reference/data-types/010-supported-data-types.md
index c86bccd..27dfbd8 100644
--- a/_docs/sql-reference/data-types/010-supported-data-types.md
+++ b/_docs/sql-reference/data-types/010-supported-data-types.md
@@ -31,7 +31,7 @@ Drill reads from and writes to data sources having a wide variety of types. Dril
     <td valign="top">2015-12-30</td>
   </tr>
   <tr>
-    <td valign="top">DECIMAL(p,s), or DEC(p,s), NUMERIC(p,s)***</td>
+    <td valign="top">DECIMAL(p,s), or DEC(p,s), NUMERIC(p,s)*</td>
     <td valign="top">38-digit precision number, precision is p, and scale is s</td>
     <td valign="top">DECIMAL(6,2) is 1234.56,  4 digits before and 2 digits after the decimal point</td>
   </tr>
@@ -61,7 +61,7 @@ Drill reads from and writes to data sources having a wide variety of types. Dril
     <td valign="top">'1-2' year to month<br><a href="http://tshiran.github.io/drill/docs/data-type-conversion/#casting-intervals">More examples</a></td>
   </tr>
   <tr>
-    <td valign="top">SMALLINT*</td>
+    <td valign="top">SMALLINT**</td>
     <td valign="top">2-byte signed integer in the range -32,768 to 32,767</td>
     <td valign="top">32000</td>
   </tr>
@@ -76,14 +76,14 @@ Drill reads from and writes to data sources having a wide variety of types. Dril
     <td valign="top">2015-12-30 22:55:55.23<br> <a href="http://tshiran.github.io/drill/docs/date-time-and-timestamp/">More examples</a></td>
   </tr>
   <tr>
-    <td valign="top">CHARACTER VARYING, CHARACTER, CHAR, or VARCHAR**</td>
+    <td valign="top">CHARACTER VARYING, CHARACTER, CHAR, or VARCHAR***</td>
     <td valign="top">UTF8-encoded variable-length string. In this release, CHAR, its aliases, and VARCHAR types are not fundamentally different types. The default limit is 1 character. The maximum character limit is 2,147,483,647.</td>
     <td valign="top">CHAR(30) casts data to a 30-character string maximum.</td>
   </tr>
 </table>
-\* Not currently supported.  
-\*\* Currently, Drill supports only variable-length strings.  
-\*\*\* In this release, the NUMERIC data type is an alias for the DECIMAL data type.  
+\* In this release, the NUMERIC data type is an alias for the DECIMAL data type.  
+\*\* Not currently supported.  
+\*\*\* Currently, Drill supports only variable-length strings.  
 
 ## Casting and Converting Data Types
 


[15/50] [abbrv] drill git commit: Adding mobile viewport and increasing body font size on smaller width

Posted by ts...@apache.org.
Adding mobile viewport and increasing body font size on smaller width


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

Branch: refs/heads/gh-pages
Commit: ffa83005f038d13c36595e94286657d8c26494b0
Parents: 3b66c46
Author: Danny <dk...@batchblue.com>
Authored: Wed Apr 29 20:03:21 2015 -0400
Committer: Danny <dk...@batchblue.com>
Committed: Wed Apr 29 20:03:21 2015 -0400

----------------------------------------------------------------------
 _includes/head.html | 1 +
 css/responsive.css  | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/ffa83005/_includes/head.html
----------------------------------------------------------------------
diff --git a/_includes/head.html b/_includes/head.html
index 52da5fd..338562b 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -1,6 +1,7 @@
 <head>
 
 <meta charset="UTF-8">
+<meta name=viewport content="width=device-width, initial-scale=1">
 {% if site.noindex == 1 %}<meta name="robots" content="noindex">{% endif %}
 
 <title>{% if page.title %}{{ page.title }} - {{ site.title_suffix }}{% else %}{{ site.title }}{% endif %}</title>

http://git-wip-us.apache.org/repos/asf/drill/blob/ffa83005/css/responsive.css
----------------------------------------------------------------------
diff --git a/css/responsive.css b/css/responsive.css
index e1a842d..2b806c7 100644
--- a/css/responsive.css
+++ b/css/responsive.css
@@ -105,6 +105,9 @@ nav.breadcrumbs{
   }
 }
 @media (max-width: 570px) {
+  body {
+    font-size: 20px;
+  }
   #menu ul li.force-expand.nav, #menu ul li.force-expand#twitter-menu-item {
     clear: both;
     width: 100%;


[20/50] [abbrv] drill git commit: Making homepage responsive. Breaking at 570px max width and giving td display block, aligning bg images and text to the left. Increasing font sizes, differentiating between h1 and h2. Adding margins to text.

Posted by ts...@apache.org.
Making homepage responsive. Breaking at 570px max width and giving td
display block, aligning bg images and text to the left. Increasing font
sizes, differentiating between h1 and h2. Adding margins to text.


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

Branch: refs/heads/gh-pages
Commit: 0906e2af81cf3506d6aaeee76a53fa9f693a0a49
Parents: b64cd54
Author: Danny <dk...@batchblue.com>
Authored: Wed Apr 29 23:19:53 2015 -0400
Committer: Danny <dk...@batchblue.com>
Committed: Wed Apr 29 23:19:53 2015 -0400

----------------------------------------------------------------------
 css/responsive.css | 102 ++++++++++++++++++++++++++++++++++++++++++++++--
 css/style.css      |  20 +++++++++-
 index.html         |  48 ++++++++++++-----------
 js/drill.js        |  10 -----
 4 files changed, 144 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/0906e2af/css/responsive.css
----------------------------------------------------------------------
diff --git a/css/responsive.css b/css/responsive.css
index 2b806c7..99d4c5a 100644
--- a/css/responsive.css
+++ b/css/responsive.css
@@ -8,6 +8,9 @@ nav.breadcrumbs{
 #menu ul li.menu-break {
   display:none;
 }
+.mobile-break {
+  display: none;
+}
 
 /*@media (max-width: 768px) {
   #menu ul li{
@@ -26,6 +29,9 @@ nav.breadcrumbs{
 }
 
 @media (max-width: 1024px) {
+  table.intro {
+    width: 940px;
+  }
   .mw {
     min-width: 0px;
   }
@@ -103,11 +109,26 @@ nav.breadcrumbs{
   #menu ul li.force-expand.search-bar {
     clear:both;
   }
+
+  /* Responsive Homepage 768 max width */
+  div.headlines.tc {
+    margin-left: 35px;
+  }
+  br.mobile-break {
+    display: block;
+  }
+  table.intro {
+    width: 768px;
+  }
 }
+
 @media (max-width: 570px) {
-  body {
-    font-size: 20px;
-  }
+
+  /* Responsive Layout 570 max width */
+
+
+  /* Responsive Menu 570 max width */
+
   #menu ul li.force-expand.nav, #menu ul li.force-expand#twitter-menu-item {
     clear: both;
     width: 100%;
@@ -132,3 +153,78 @@ nav.breadcrumbs{
     float: right;
   }
 
+  /* Responsive Homepage 570 max width */
+  #header .scroller .item .tc h1{
+    font-size: 40px;
+  }
+  #header .scroller .item .tc h2 {
+    font-size: 24px;
+    line-height: 32px;
+  }
+  #header .scroller .item div.headlines.tc {
+    margin-left: 30px;
+  }
+  div.headlines a.download-headline {
+    font-size: .7em;
+  }
+  #header .scroller .item div.headlines .btn { font-size: 16px; }
+
+  div.alertbar .hor-bar:after {
+    content: "";
+  }
+  div.alertbar {
+    text-align: left;
+    padding-left: 25px;
+  }
+  div.alertbar a {
+    display:block;
+  }
+  div.alertbar span.strong {
+    display: block;
+  }
+  table.intro {
+    width: 100%;
+    background: none;
+  }
+  table.intro td {
+    display: block;
+    padding: 25px 0 5px 0;
+  }
+  table.intro td h1 {
+    font-size: 24px;
+    text-align: left;
+    padding-left: 70px;
+  }
+  table.intro td.ag, table.intro td.fl, table.intro td.fa {
+    background-position: 30px 23%;
+  }
+  table.intro p {
+    font-size: 16px;
+    line-height: 24px;
+    padding: 2px 25px 15px 30px;
+    text-align: left;
+  }
+  table.intro span {
+    position: relative;
+    bottom: 10px;
+    padding-left: 30px;
+    text-align: left;
+  }
+
+  .home_txt p {
+    margin: 20px 10px 20px 10px;
+  }
+  .home_txt h1 {
+    font-size: 32px;
+    margin: 20px 10px 20px 10px;
+  }
+
+  .home_txt h2 {
+    font-size: 20px;
+    margin: 20px 10px 20px 10px;
+
+  }
+
+}
+
+

http://git-wip-us.apache.org/repos/asf/drill/blob/0906e2af/css/style.css
----------------------------------------------------------------------
diff --git a/css/style.css b/css/style.css
index 88d252e..ed8fbe5 100755
--- a/css/style.css
+++ b/css/style.css
@@ -339,12 +339,15 @@ a.anchor {
 	width:530px;
 }
 
-#header .scroller .item .tc h1 {
+#header .scroller .item .tc h1, #header .scroller .item .tc h2 {
 	font-size:36px;
 	font-weight:lighter;
 	margin:0 0 8px 0;
 	padding:0;
 }
+#header .scroller .item .tc h2 {
+  font-size: 20px;
+}
 
 #header .scroller .item .tc p {
 	font-size:14px;
@@ -452,6 +455,20 @@ a.anchor {
 .dots .dot.sel {
 	box-shadow: inset 0 0 0 8px white;
 }
+div.alertbar
+  {
+    background-color:#ffc;
+    text-align: center;
+    display: block;
+    padding:10px;
+    border-bottom: solid 1px #cc9;
+  }
+div.alertbar .hor-bar:after {
+  content: "|";
+}
+span.strong {
+  font-weight: bold;
+}
 
 .introWrapper {
 	border-bottom:1px solid #CCC;
@@ -462,6 +479,7 @@ table.intro {
 	background:url(../images/intro-bg.gif) no-repeat center;
 	table-layout:fixed;
 	text-align:center;	
+  width: 940px;
 }
 
 table.intro td {

http://git-wip-us.apache.org/repos/asf/drill/blob/0906e2af/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 8c7b32a..6485fc0 100755
--- a/index.html
+++ b/index.html
@@ -12,36 +12,40 @@ layout: default
 <div class="dots"></div>
 <div class="scroller">
   <div class="item">
-    <div class="tc">
-      <h1>Apache Drill</h1>
-      <h1 style="font-size:20px">Schema-free SQL Query Engine for Hadoop and NoSQL</h1>
-      <a href="{{ site.baseurl }}/download/" class="btn btn-1 btn-1c"><span>DOWNLOAD NOW</span></a>
+    <div class="headlines tc">
+      <h1 class="main-headline">Apache Drill</h1>
+      <h2 id="sub-headline">Schema-free SQL Query Engine <br class="mobile-break" /> for Hadoop and NoSQL</h2>
+      <a href="{{ site.baseurl }}/download/" class="download-headline btn btn-1 btn-1c"><span>DOWNLOAD NOW</span></a>
     </div>
   </div>
 </div>
 
 </div><!-- header -->
-<div id="alertbar" style="background-color:#ffc; text-align: center;display: block;padding:10px; border-bottom: solid 1px #cc9">
-<strong>News:</strong> <a href="{{ site.baseurl }}/blog/2015/03/31/drill-0.8-released/">Drill 0.8 Released</a> | <a href="{{ site.baseurl }}/blog/2015/03/23/microstrategy-announces-drill-support/">MicroStrategy Announces Drill Support</a>
+<div class="alertbar">
+  <span class="strong">News:</span> <a href="{{ site.baseurl }}/blog/2015/03/31/drill-0.8-released/">Drill 0.8 Released</a> <span class="hor-bar"></span> <a href="{{ site.baseurl }}/blog/2015/03/23/microstrategy-announces-drill-support/">MicroStrategy Announces Drill Support</a>
 </div>
 
 <div class="mw introWrapper">
-  <table class="intro" cellpadding="0" cellspacing="0" align="center" width="940">
-    <td class="ag">
-      <h1>Agility</h1>
-      <p>Get faster insights from big data with no IT intervention</p>
-      <span><a href="#agility">LEARN MORE</a></span>
-    </td>
-    <td class="fl">
-      <h1>Flexibility</h1>
-      <p>Analyze semi-structured/nested data coming from NoSQL applications</p>
-      <span><a href="#flexibility">LEARN MORE</a></span>
-    </td>
-    <td class="fa">
-      <h1>Familiarity</h1>
-      <p>Leverage existing SQL skillsets, BI tools and Apache Hive deployments</p>
-      <span><a href="#familiarity">LEARN MORE</a></span>
-    </td>
+  <table class="intro" cellpadding="0" cellspacing="0" align="center">
+    <tbody>
+      <tr>
+        <td class="ag">
+          <h1>Agility</h1>
+          <p>Get faster insights from big data with no IT intervention</p>
+          <span><a href="#agility">LEARN MORE</a></span>
+        </td>
+        <td class="fl">
+          <h1>Flexibility</h1>
+          <p>Analyze semi-structured/nested data coming from NoSQL applications</p>
+          <span><a href="#flexibility">LEARN MORE</a></span>
+        </td>
+        <td class="fa">
+          <h1>Familiarity</h1>
+          <p>Leverage existing SQL skillsets, BI tools and Apache Hive deployments</p>
+          <span><a href="#familiarity">LEARN MORE</a></span>
+        </td>
+      </tr>
+    </tbody>
   </table>
 </div>
 

http://git-wip-us.apache.org/repos/asf/drill/blob/0906e2af/js/drill.js
----------------------------------------------------------------------
diff --git a/js/drill.js b/js/drill.js
index 914945a..bf276f8 100644
--- a/js/drill.js
+++ b/js/drill.js
@@ -98,22 +98,12 @@ Drill.Docs = {
   },
 
   setCurrentDoc : function() {
-    var current_l1 = $("li.toctree-l3.current");
     var current_l2 = $("li.toctree-l2.current");
     var current_l3 = $("li.toctree-l3.current");
 
     Drill.Docs._setPlusMinus(current_l2);
     Drill.Docs._setPlusMinus( current_l3.parent().prev("li") ); // requires knowledge of html structure...bad...bad.
     // alternatively, set these up in the rendering of the docs, like the current_section and current are done.
-
-    // set current <li>, starting from innermost possibility
-    if(current_l3.length > 0){
-      current_l3.addClass("current");
-    } else if(current_l2.length > 0){
-      current_l2.addClass("current");
-    } else if(current_l1.length > 0){
-      current_l1.addClass("current");
-    }
   },
 
   _setPlusMinus : function(parent) {


[39/50] [abbrv] drill git commit: commands reorg

Posted by ts...@apache.org.
http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/manage-drill/010-manage-drill-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/010-manage-drill-introduction.md b/_docs/manage-drill/010-manage-drill-introduction.md
index f3d4e04..bc9179a 100644
--- a/_docs/manage-drill/010-manage-drill-introduction.md
+++ b/_docs/manage-drill/010-manage-drill-introduction.md
@@ -2,6 +2,6 @@
 title: "Manage Drill Introduction"
 parent: "Manage Drill"
 ---
-When using Drill, you need to configure memory to make sufficient memory available for your application. The more memory for Drill, the better. You may need to modify options for performance or functionality. For example, the default storage format for CTAS
-statements is Parquet. You can modify the default setting so that output data
-is stored in CSV or JSON format. The many options you can configure are covered in this section. This section also includes stopping and restarting a Drillbit on a node, ports used by Drill, and partition pruning.
+When using Drill, you need to make sufficient memory available Drill and other workloads running on the cluster. You might want to modify options for performance or functionality. For example, the default storage format for CTAS
+statements is Parquet. Using a configuration option, you can modify the default setting so that output data
+is stored in CSV or JSON format. The section covers the many options you can configure and how to configure memory resources for Drill running along side other workloads. This section also includes stopping and restarting a Drillbit on a node, ports used by Drill, and partition pruning.

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/manage-drill/011-configuring-memory.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/011-configuring-memory.md b/_docs/manage-drill/011-configuring-memory.md
index 9058cdb..68c2bf0 100644
--- a/_docs/manage-drill/011-configuring-memory.md
+++ b/_docs/manage-drill/011-configuring-memory.md
@@ -1,5 +1,5 @@
 ---
-title: "Configuring Memory"
+title: "Configuring Memory for Drill"
 parent: "Manage Drill"
 ---
 

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/manage-drill/012-configuring-different-workloads.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/012-configuring-different-workloads.md b/_docs/manage-drill/012-configuring-different-workloads.md
new file mode 100644
index 0000000..874839e
--- /dev/null
+++ b/_docs/manage-drill/012-configuring-different-workloads.md
@@ -0,0 +1,5 @@
+---
+title: "Configuring Different Workloads"
+parent: "Manage Drill"
+---
+

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/manage-drill/012-multitenant-and-multi-instance-architectures.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/012-multitenant-and-multi-instance-architectures.md b/_docs/manage-drill/012-multitenant-and-multi-instance-architectures.md
deleted file mode 100644
index db61b45..0000000
--- a/_docs/manage-drill/012-multitenant-and-multi-instance-architectures.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Multitenant and Multi-instance Architectures"
-parent: "Manage Drill"
----
-

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
new file mode 100644
index 0000000..29b830c
--- /dev/null
+++ b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
@@ -0,0 +1,22 @@
+---
+title: "Configuring Different Workloads Introduction"
+parent: "Configuring Different Workloads"
+---
+
+Drill supports multiple users sharing a drillbit. You can also run separate drillbits running on different nodes in the cluster.
+
+Drill typically runs along side other workloads, including the following:  
+
+* Mapreduce  
+* Yarn  
+* HBase  
+* Hive and Pig  
+* Spark  
+
+You need to plan and configure these resources for use with Drill and other workloads: 
+
+* [Memory]({{site.baseurl}}/docs/configuring-memory)  
+* [CPU]({{site.baseurl}}/docs/how-to-manage-drill-cpu-resources)  
+* Disk  
+
+["How to Run Drill in a Cluster"]({{site.baseurl}}/docs/how-to-run-drill-in-a-cluster) covers configuration for sharing a drillbit and ["How Multiple Users Share a Drillbit"]({{site.baseurl}}/docs/how-multiple-users-share-a-drillbit) covers configuration for drillbits running on different nodes in the cluster.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md b/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
deleted file mode 100644
index c517586..0000000
--- a/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: "Multitenant and Multi-instance Architectures Introduction"
-parent: "Multitenant and Multi-instance Architectures"
----
-
-Drill supports multitenant and multi-instance architectures. In a multitenant architecture, multiple users share a drillbit. In a multi-instance architectures, tenants use separate drillbits running on different nodes in the cluster.
-
-Drill typically runs along side many application frameworks, including the following:  
-
-* Mapreduce  
-* Yarn  
-* HBase  
-* Hive and Pig  
-* Spark  
-
-You need to plan and configure these resources for use with Drill in a multitenant or multi-instance environment: 
-
-* [Memory]({{site.baseurl}}/docs/configuring-memory)  
-* [CPU]({{site.baseurl}}/docs/how-to-manage-drill-cpu-resources)  
-* Disk  
-
-["How to Run Drill in a Cluster"]({{site.baseurl}}/docs/how-to-run-drill-in-a-cluster) covers configuration for a multitenant environment and ["How Multiple Users Share a Drillbit"]({{site.baseurl}}/docs/how-multiple-users-share-a-drillbit) covers configuration for a multi-instance environment.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
new file mode 100644
index 0000000..11e4747
--- /dev/null
+++ b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
@@ -0,0 +1,78 @@
+---
+title: "Configuring Drill in a Cluster"
+parent: "Configuring Different Workloads"
+---
+Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designate which partition handles which workload. 
+
+To reserve memory resources for Drill, you modify the `warden.drill-bits.conf` file in `/opt/mapr/conf/conf.d`. This file is created automatically when you install Drill on a node. 
+
+    [root@centos23 conf.d]# pwd
+    /opt/mapr/conf/conf.d
+    [root@centos23 conf.d]# ls
+    warden.drill-bits.conf  warden.nodemanager.conf  warden.resourcemanager.conf
+
+You add the following lines to the file:
+
+    service.heapsize.min=<some value in MB>
+    service.heapsize.max=<some value in MB>
+    service.heapsize.percent=<some whole number value>
+
+## Configuring Drill in a YARN-enabled MapR Cluster
+
+For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
+
+File system = 20G  
+HBase = 20G  
+Yarn = 20G  
+OS = 8G  
+
+To add Drill to the cluster, how do you change memory allocation? It depends on your application. If Yarn does most of the work, give Drill 20G, for example, and give Yarn 60G. If you expect a heavy query load, give Drill 60G and Drill 20G.
+
+{% include startnote.html %}Drill will execute queries within Yarn soon.{% include endnote.html %} [DRILL-142](https://issues.apache.org/jira/browse/DRILL-142)
+
+<!-- YARN consists of 2 main services ResourceManager(one instance in cluster, more if HA is configured) and NodeManager(one instance per node). See mr1.memory.percent, mr1.cpu.percent and 
+mr1.disk.percent in warden.conf. Rest is given to YARN applications.
+Also see /opt/mapr/conf/conf.d/warden.resourcemanager.conf and
+ /opt/mapr/conf/conf.d/warden.nodemanager.conf for resources given to ResourceManager and NodeManager respectively.
+
+## Configuring Drill in a MapReduce V1-enabled cluster
+
+Similar files exist for other installed services, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf). For example:
+## What are the memory/resource configurations set in warden in a non-YARN cluster? 
+
+Every service will have 3 values defined in warden.conf (/opt/mapr/conf)
+service.command.<servicename>.heapsize.percent
+service.command.<servicename>.heapsize.max
+service.command.<servicename>.heapsize.min
+This is percentage of memory for that service bounded by min and max values.
+
+There will also be additional files in /opt/mapr/conf/conf.d in format 
+warden.<servicename>.conf. They will have entries like
+service.heapsize.min
+service.heapsize.max
+service.heapsize.percent -->
+
+## Managing Memory
+
+To run Drill in a cluster with MapReduce, HBase, Spark, and other workloads, manage memory according to your application needs. 
+
+To run Drill in a MapR cluster, allocate memory by configuring settings in warden.conf, as described in the [MapR documentation]().
+
+### Drill Memory
+You can configure the amount of direct memory allocated to a Drillbit for
+query processing, as described in the section, ["Configuring Memory"](({{site.baseurl}}/docs/configuring-memory).
+
+### Memory in a MapR Cluster
+Memory and disk for Drill and other services that are not associated with roles on a MapR cluster are shared with other services. You manage the chunk of memory for these services in os heap settings in `warden.conf` and in configuration files of the particular service. The warden os heap settings are:
+
+    service.command.os.heapsize.percent
+    service.command.os.heapsize.max
+    service.command.os.heapsize.min
+
+For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
+* [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)
+* [Cluster Resource Allocation](http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation)
+* [Customizing Memory Settings for MapReduce v1](http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1)
+
+## How to Manage Drill CPU Resources
+Currently, you do not manage CPU resources within Drill. [Use Linux `cgroups`](http://en.wikipedia.org/wiki/Cgroups) to manage the CPU resources.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md b/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
deleted file mode 100644
index d8609c5..0000000
--- a/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-title: "How to Run Drill in a Cluster"
-parent: "Multitenant and Multi-instance Architectures"
----
-Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designation which partition handles which workload. For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
-
-File system = 20G  
-HBase = 20G  
-Yarn = 20G  
-OS = 8G  
-
-To add Drill to the cluster, how do you change memory allocation? It depends on your application. If Yarn does most of the work, give Drill 20G, for example, and give Yarn 60G. If you expect a heavy query load, give Drill 60G and Drill 20G.
-
-{% include startnote.html %}Drill will execute queries within Yarn soon.{% include endnote.html %}
-
-For information about Drill and Yarn, see [DRILL-142](https://issues.apache.org/jira/browse/DRILL-142).
-
-## Managing Memory
-
-To run Drill in a cluster with MapReduce, HBase, Spark, and other workloads, manage memory according to your application needs. 
-
-To run Drill in a MapR cluster, allocate memory by configuring settings in warden.conf, as described in the [MapR documentation]().
-
-### Drill Memory
-You can configure the amount of direct memory allocated to a Drillbit for
-query processing, as described in the section, ["Configuring Memory"](({{site.baseurl}}/docs/configuring-memory).
-
-### Memory in a MapR Cluster
-Memory and disk for Drill and other services that are not associated with roles on a MapR cluster are shared with other services. You manage the chunk of memory for these services in os heap settings in `warden.conf` and in configuration files of the particular service. The warden os heap settings are:
-
-    service.command.os.heapsize.percent
-    service.command.os.heapsize.max
-    service.command.os.heapsize.min
-
-For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
-* [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)
-* [Cluster Resource Allocation](http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation)
-* [Customizing Memory Settings for MapReduce v1](http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1)
-
-## How to Manage Drill CPU Resources
-Currently, you do not manage CPU resources within Drill. [Use Linux `cgroups`](http://en.wikipedia.org/wiki/Cgroups) to manage the CPU resources.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/manage-drill/017-configuring-a-shared-drillbit.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/017-configuring-a-shared-drillbit.md b/_docs/manage-drill/017-configuring-a-shared-drillbit.md
new file mode 100644
index 0000000..0466d3b
--- /dev/null
+++ b/_docs/manage-drill/017-configuring-a-shared-drillbit.md
@@ -0,0 +1,65 @@
+---
+title: "Configuring a Shared Drillbit"
+parent: "Configuring Different Workloads"
+---
+To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization.
+
+##Configuring Drill Query Queuing
+
+Set [options in sys.options]({{site.baseurl}}/docs/configuration-options-introduction/) to enable and manage query queuing, which is turned off by default. There are two types of queues: large and small. You configure a maximum number of queries that each queue allows by configuring the following options in the `sys.options` table:
+
+* exec.queue.large  
+* exec.queue.small  
+
+### Example Configuration
+
+For example, you configure the queue reserved for large queries to hold a 5-query maximum. You configure the queue reserved for small queries to hold 20 queries. Users start to run queries, and Drill receives the following query requests in this order:
+
+* Query A (blue): 1 billion records, Drill estimates 10 million rows will be processed  
+* Query B (red): 2 billion records, Drill estimates 20 million rows will be processed  
+* Query C: 1 billion records  
+* Query D: 100 records
+
+The exec.queue.threshold default is 30 million, which is the estimated rows to be processed by the query. Queries A and B are queued in the large queue. The estimated rows to be processed reaches the 30 million threshold, filling the queue to capacity. The query C request arrives and goes on the wait list, and then query D arrives. Query D is queued immediately in the small queue because of its small size, as shown in the following diagram: 
+
+![drill queuing]({{ site.baseurl }}/docs/img/queuing.png)
+
+The Drill queuing configuration in this example tends to give many users running small queries a rapid response. Users running a large query might experience some delay until an earlier-received large query returns, freeing space in the large queue to process queries that are waiting.
+
+## Controlling Parallelization
+
+By default, Drill parallelizes operations when number of records manipulated within a fragment reaches 100,000. When parallelization of operations is high, the cluster operates as fast as possible, which is fine for a single user. In a contentious multi-tenant situation, however, you need to reduce parallelization to levels based on user needs.
+
+### Parallelization Configuration Procedure
+
+To configure parallelization, configure the following options in the `sys.options` table:
+
+* `planner.width.max.per.node`  
+  The maximum degree of distribution of a query across cores and cluster nodes.
+* `planner.width.max.per.query`  
+  Same as max per node but applies to the query as executed by the entire cluster.
+
+Configure the `planner.width.max.per.node` to achieve fine grained, absolute control over parallelization. 
+
+<!-- ??For example, setting the `planner.width.max.per.query` to 60 will not accelerate Drill operations because overlapping does not occur when executing 60 queries at the same time.??
+
+### Example of Configuring Parallelization
+
+For example, the default settings parallelize 70 percent of operations up to 1,000 cores. If you have 30 cores per node in a 10-node cluster, or 300 cores, parallelization occurs on approximately 210 cores. Consequently, a single user can get 70 percent usage from a cluster and no more due to the constraints configured by the `planner.width.max.per.query`.
+
+A parallelizer in the Foreman transforms the physical plan into multiple phases. A complicated query can have multiple, major fragments. A default parallelization of 70 percent of operations allows some overlap of query phases. In the example, 210 ??for each core or major fragment to a maximum of 410??.
+
+??Drill uses pipelines, blocking/nonblocking, memory is not fungible. CPU resources are fungible. There is contention for CPUs.?? -->
+
+## Data Isolation
+
+Tenants can share data on a cluster using Drill views and impersonation. ??Link to impersonation doc.??
+
+
+
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md b/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md
deleted file mode 100644
index 82f020a..0000000
--- a/_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-title: "How Multiple Users Share a Drillbit"
-parent: "Multitenant and Multi-instance Architectures"
----
-To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization.
-
-##Configuring Drill Query Queuing
-
-Set [options in sys.options]({{site.baseurl}}/docs/configuration-options-introduction/) to enable and manage query queuing, which is turned off by default. There are two types of queues: large and small. You configure a maximum number of queries that each queue allows by configuring the following options in the `sys.options` table:
-
-* exec.queue.large  
-* exec.queue.small  
-
-### Example Configuration
-
-For example, you configure the queue reserved for large queries to hold a 5-query maximum. You configure the queue reserved for small queries to hold 20 queries. Users start to run queries, and Drill receives the following query requests in this order:
-
-* Query A (blue): 1 billion records, Drill estimates 10 million rows will be processed  
-* Query B (red): 2 billion records, Drill estimates 20 million rows will be processed  
-* Query C: 1 billion records  
-* Query D: 100 records
-
-The exec.queue.threshold default is 30 million, which is the estimated rows to be processed by the query. Queries A and B are queued in the large queue. The estimated rows to be processed reaches the 30 million threshold, filling the queue to capacity. The query C request arrives and goes on the wait list, and then query D arrives. Query D is queued immediately in the small queue because of its small size, as shown in the following diagram: 
-
-![drill queuing]({{ site.baseurl }}/docs/img/queuing.png)
-
-The Drill queuing configuration in this example tends to give many users running small queries a rapid response. Users running a large query might experience some delay until an earlier-received large query returns, freeing space in the large queue to process queries that are waiting.
-
-## Controlling Parallelization
-
-By default, Drill parallelizes operations when number of records manipulated within a fragment reaches 100,000. When parallelization of operations is high, the cluster operates as fast as possible, which is fine for a single user. In a contentious multi-tenant situation, however, you need to reduce parallelization to levels based on user needs.
-
-### Parallelization Configuration Procedure
-
-To configure parallelization, configure the following options in the `sys.options` table:
-
-* `planner.width.max.per.node`  
-  The maximum degree of distribution of a query across cores and cluster nodes.
-* `planner.width.max.per.query`  
-  Same as max per node but applies to the query as executed by the entire cluster.
-
-Configure the `planner.width.max.per.node` to achieve fine grained, absolute control over parallelization. 
-
-<!-- ??For example, setting the `planner.width.max.per.query` to 60 will not accelerate Drill operations because overlapping does not occur when executing 60 queries at the same time.??
-
-### Example of Configuring Parallelization
-
-For example, the default settings parallelize 70 percent of operations up to 1,000 cores. If you have 30 cores per node in a 10-node cluster, or 300 cores, parallelization occurs on approximately 210 cores. Consequently, a single user can get 70 percent usage from a cluster and no more due to the constraints configured by the `planner.width.max.per.query`.
-
-A parallelizer in the Foreman transforms the physical plan into multiple phases. A complicated query can have multiple, major fragments. A default parallelization of 70 percent of operations allows some overlap of query phases. In the example, 210 ??for each core or major fragment to a maximum of 410??.
-
-??Drill uses pipelines, blocking/nonblocking, memory is not fungible. CPU resources are fungible. There is contention for CPUs.?? -->
-
-## Data Isolation
-
-Tenants can share data on a cluster using Drill views and impersonation. ??Link to impersonation doc.??
-
-
-
-
-
-
-
-
-

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/manage-drill/configuration-options/015-configuring-a-cluster-for-different-workloads.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/configuration-options/015-configuring-a-cluster-for-different-workloads.md b/_docs/manage-drill/configuration-options/015-configuring-a-cluster-for-different-workloads.md
deleted file mode 100644
index 23157af..0000000
--- a/_docs/manage-drill/configuration-options/015-configuring-a-cluster-for-different-workloads.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-title: "Configuring a Cluster for Different Workloads"
-parent: "Configuration Options"
----
-In this release of Drill, to configure a Drill cluster for different workloads, you re-allocate memory resources only. To re-allocate memory for services, establish baselines for performance testing, make changes in small increments, test and compare the effects of the change. 
-
-Warden allocates resources for MapR Hadoop services, such as Zookeeper or NFS, associated with roles installed on the node. You modify `warden.conf` to manage the memory allocation. For example, you might modify these default settings:
-
-    service.command.nfs.heapsize.percent=3
-    service.command.nfs.heapsize.min=64
-    service.command.nfs.heapsize.max=64
-    . . .
-    service.command.zk.heapsize.percent=1
-    service.command.zk.heapsize.max=1500
-    service.command.zk.heapsize.min=256
-
-MapR shares memory and disk among services, such as Drill and Impala, that are not associated with roles on the cluster. You manage the memory for these services in multiple files:
-
-* The os heap settings in `warden.conf`
-* Configuration files of the particular service, such as [Drill](#drill-memory-configuration), [Impala](#impala-memory-configuration), and [JobTracker](#jobtracker-memory-configuration) configuration files
-
-The names of os heap settings are:
-
-    service.command.os.heapsize.percent
-    service.command.os.heapsize.max
-    service.command.os.heapsize.min
-
-## Drill Memory Configuration
-You can configure the amount of direct memory allocated to a Drillbit for
-query processing. The default limit is 8G, but Drill prefers 16G or more
-depending on the workload. The total amount of direct memory that a Drillbit
-allocates to query operations cannot exceed the limit set.
-
-Drill mainly uses Java direct memory and performs well when executing
-operations in memory instead of storing the operations on disk. Drill does not
-write to disk unless absolutely necessary, unlike MapReduce where everything
-is written to disk during each phase of a job.
-
-The JVM heap memory does not limit the amount of direct memory available in
-a Drillbit. The on-heap memory for Drill is only about 4-8G, which should
-suffice because Drill avoids having data sit in heap memory.
-
-You can modify memory for each Drillbit node in your cluster. To modify the
-memory for a Drillbit, edit the `XX:MaxDirectMemorySize` parameter in the
-Drillbit startup script located in `<drill_installation_directory>/conf/drill-
-env.sh`.
-
-{% include startnote.html %}If this parameter is not set, the limit depends on the amount of available system memory.{% include endnote.html %}
-
-After you edit `<drill_installation_directory>/conf/drill-env.sh`, [restart
-the Drillbit
-]({{ site.baseurl }}/docs/starting-stopping-drill#starting-a-drillbit)on
-the node.
-
-## Impala Memory Configuration
-
-The configuration service for the Impala service is in the Impala env.sh file.
-
-## JobTracker Memory Configuration
-
-Memory allocated for JobTracker in `warden.conf` is used only to calculate total memory required for services to run. The -Xmx JobTracker itself is not set, allowing memory on JobTracker to grow as needed. If you want to set an upper limit on memory, set the HADOOP_HEAPSIZE env. variable in `/opt/mapr/hadoop/hadoop-0.20.2/conf/hadoop-env.sh`.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/070-sql-commands-summary.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/070-sql-commands-summary.md b/_docs/sql-reference/070-sql-commands-summary.md
index 636cedd..df07d9d 100644
--- a/_docs/sql-reference/070-sql-commands-summary.md
+++ b/_docs/sql-reference/070-sql-commands-summary.md
@@ -1,4 +1,4 @@
 ---
-title: "SQL Commands Summary"
+title: "SQL Commands"
 parent: "SQL Reference"
 ---

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/005-supported-sql-commands.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/005-supported-sql-commands.md b/_docs/sql-reference/sql-commands-summary/005-supported-sql-commands.md
deleted file mode 100644
index 40c4c0f..0000000
--- a/_docs/sql-reference/sql-commands-summary/005-supported-sql-commands.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Supported SQL Commands
-parent: "SQL Commands Summary"
----
-The following table provides a list of the SQL commands that Drill supports,
-with their descriptions and example syntax:
-
-<table style='table-layout:fixed;width:100%'>
-    <tr><th >Command</th><th >Description</th><th >Syntax</th></tr><tr><td valign="top" width="15%"><a href="/docs/alter-session-command">ALTER SESSION</a></td><td valign="top" width="60%">Changes a system setting for the duration of a session. A session ends when you quit the Drill shell. For a list of Drill options and their descriptions, refer to <a href="/docs/planning-and-execution-options">Planning and Execution Options</a>.</td><td valign="top"><pre>ALTER SESSION SET `&lt;option_name&gt;`=&lt;value&gt;;</pre></td></tr><tr><td valign="top" ><a href="/docs/alter-system-command">ALTER SYSTEM</a></td><td valign="top" >Permanently changes a system setting. The new settings persist across all sessions. For a list of Drill options and their descriptions, refer to <a href="/docs/planning-and-execution-options">Planning and Execution Options</a>.</td><td valign="top" ><pre>ALTER SYSTEM SET `&lt;option_name&gt;`=&lt;value&gt;;</pre></td></tr><tr><td valign="top" ><p><a href="/docs/crea
 te-table-as--ctas-command">CREATE TABLE AS<br />(CTAS)</a></p></td><td valign="top" >Creates a new table and populates the new table with rows returned from a SELECT query. Use the CREATE TABLE AS (CTAS) statement in place of INSERT INTO. When you issue the CTAS command, you create a directory that contains parquet or CSV files. Each workspace in a file system has a default file type.<br />You can specify which writer you want Drill to use when creating a table: parquet, CSV, or JSON (as specified with the <code>store.format</code> option).</td><td valign="top" ><pre class="programlisting">CREATE TABLE new_table_name AS &lt;query&gt;;</pre></td></tr><tr><td - valign="top" ><a href="/docs/create-view-command">CREATE VIEW </a></td><td - valign="top" >Creates a virtual structure for the result set of a stored query.-</td><td -valign="top" ><pre>CREATE [OR REPLACE] VIEW [workspace.]view_name [ (column_name [, ...]) ] AS &lt;query&gt;;</pre></td></tr><tr><td  valign="top" ><a href="/docs
 /describe-command">DESCRIBE</a></td><td  valign="top" >Returns information about columns in a table or view.</td><td valign="top" ><pre>DESCRIBE [workspace.]table_name|view_name</pre></td></tr><tr><td valign="top" ><a href="/docs/drop-view-command">DROP VIEW</a></td><td valign="top" >Removes a view.</td><td valign="top" ><pre>DROP VIEW [workspace.]view_name ;</pre></td></tr><tr><td  valign="top" ><a href="/docs/explain-commands">EXPLAIN PLAN FOR</a></td><td valign="top" >Returns the physical plan for a particular query.</td><td valign="top" ><pre>EXPLAIN PLAN FOR &lt;query&gt;;</pre></td></tr><tr><td valign="top" ><a href="/docs/explain-commands">EXPLAIN PLAN WITHOUT IMPLEMENTATION FOR</a></td><td valign="top" >Returns the logical plan for a particular query.</td><td  valign="top" ><pre>EXPLAIN PLAN WITHOUT IMPLEMENTATION FOR &lt;query&gt;;</pre></td></tr><tr><td colspan="1" valign="top" ><a href="/docs/select-statements" rel="nofollow">SELECT</a></td><td valign="top" >Retrieves dat
 a from tables and files.</td><td  valign="top" ><pre>[WITH subquery]<br />SELECT column_list FROM table_name <br />[WHERE clause]<br />[GROUP BY clause]<br />[HAVING clause]<br />[ORDER BY clause];</pre></td></tr><tr><td  valign="top" ><a href="/docs/show-databases-and-show-schemas-commands">SHOW DATABASES </a></td><td valign="top" >Returns a list of available schemas. Equivalent to SHOW SCHEMAS.</td><td valign="top" ><pre>SHOW DATABASES;</pre></td></tr><tr><td valign="top" ><a href="/docs/show-files-command" >SHOW FILES</a></td><td valign="top" >Returns a list of files in a file system schema.</td><td valign="top" ><pre>SHOW FILES IN filesystem.`schema_name`;<br />SHOW FILES FROM filesystem.`schema_name`;</pre></td></tr><tr><td valign="top" ><a href="/docs/show-databases-and-show-schemas-commands">SHOW SCHEMAS</a></td><td - valign="top" >Returns a list of available schemas. Equivalent to SHOW DATABASES.</td><td valign="top" ><pre>SHOW SCHEMAS;</pre></td></tr><tr><td valign="top" ><
 a href="/docs/show-tables-command">SHOW TABLES</a></td><td valign="top" >Returns a list of tables and views.</td><td valign="top" ><pre>SHOW TABLES;</pre></td></tr><tr><td valign="top" ><a href="/docs/use-command">USE</a></td><td valign="top" >Change to a particular schema. When you opt to use a particular schema, Drill issues queries on that schema only.</td><td valign="top" ><pre>USE schema_name;</pre></td></tr></table>

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/010-alter-session-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/010-alter-session-command.md b/_docs/sql-reference/sql-commands-summary/010-alter-session-command.md
deleted file mode 100644
index 8077930..0000000
--- a/_docs/sql-reference/sql-commands-summary/010-alter-session-command.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-title: "ALTER SESSION Command"
-parent: "SQL Commands Summary"
----
-The ALTER SESSION command changes a system setting for the duration of a
-session. Session level settings override system level settings.
-
-## Syntax
-
-The ALTER SESSION command supports the following syntax:
-
-    ALTER SESSION SET `<option_name>`=<value>;
-
-## Parameters
-
-*option_name*  
-This is the option name as it appears in the systems table.
-
-*value*  
-A value of the type listed in the sys.options table: number, string, boolean,
-or float. Use the appropriate value type for each option that you set.
-
-## Usage Notes
-
-Use the ALTER SESSION command to set Drill query planning and execution
-options per session in a cluster. The options that you set using the ALTER
-SESSION command only apply to queries that run during the current Drill
-connection. A session ends when you quit the Drill shell. You can set any of
-the system level options at the session level.
-
-You can run the following query to see a complete list of planning and
-execution options that are currently set at the system or session level:
-
-    0: jdbc:drill:zk=local> SELECT name, type FROM sys.options WHERE type in ('SYSTEM','SESSION') order by name;
-    +------------+----------------------------------------------+
-    |   name                                       |    type    |
-    +----------------------------------------------+------------+
-    | drill.exec.functions.cast_empty_string_to_null | SYSTEM   |
-    | drill.exec.storage.file.partition.column.label | SYSTEM   |
-    | exec.errors.verbose                          | SYSTEM     |
-    | exec.java_compiler                           | SYSTEM     |
-    | exec.java_compiler_debug                     | SYSTEM     |
-    …
-    +------------+----------------------------------------------+
-
-{% include startnote.html %}This is a truncated version of the list.{% include endnote.html %}
-
-## Example
-
-This example demonstrates how to use the ALTER SESSION command to set the
-`store.json.all_text_mode` option to “true” for the current Drill session.
-Setting this option to “true” enables text mode so that Drill reads everything
-in JSON as a text object instead of trying to interpret data types. This
-allows complicated JSON to be read using CASE and CAST.
-
-    0: jdbc:drill:zk=local> alter session set `store.json.all_text_mode`= true;
-    +------------+------------+
-    |   ok  |  summary   |
-    +------------+------------+
-    | true      | store.json.all_text_mode updated. |
-    +------------+------------+
-    1 row selected (0.046 seconds)
-
-You can issue a query to see all of the session level settings. Note that the
-option type is case-sensitive.
-
-    0: jdbc:drill:zk=local> SELECT name, type, bool_val FROM sys.options WHERE type = 'SESSION' order by name;
-    +------------+------------+------------+
-    |   name    |   type    |  bool_val  |
-    +------------+------------+------------+
-    | store.json.all_text_mode | SESSION    | true      |
-    +------------+------------+------------+
-    1 row selected (0.176 seconds)
-

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/020-alter-system.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/020-alter-system.md b/_docs/sql-reference/sql-commands-summary/020-alter-system.md
deleted file mode 100644
index 7e8200f..0000000
--- a/_docs/sql-reference/sql-commands-summary/020-alter-system.md
+++ /dev/null
@@ -1,102 +0,0 @@
----
-title: "ALTER SYSTEM Command"
-parent: "SQL Commands Summary"
----
-The ALTER SYSTEM command permanently changes a system setting. The new setting
-persists across all sessions. Session level settings override system level
-settings.
-
-## Syntax
-
-The ALTER SYSTEM command supports the following syntax:
-
-    ALTER SYSTEM SET `<option_name>`=<value>;
-
-## Parameters
-
-*option_name*
-
-This is the option name as it appears in the systems table.
-
-_value_
-
-A value of the type listed in the sys.options table: number, string, boolean,
-or float. Use the appropriate value type for each option that you set.
-
-## Usage Notes
-
-Use the ALTER SYSTEM command to permanently set Drill query planning and
-execution options per cluster. Options set at the system level affect the
-entire system and persist between restarts.
-
-You can run the following query to see a complete list of planning and
-execution options that you can set at the system level:
-
-    0: jdbc:drill:zk=local> select name, type, num_val, string_val, bool_val, float_val from sys.options where type like 'SYSTEM' order by name;
-    +------------+------------+------------+------------+------------+------------+
-    |    name    |    type    |  num_val   | string_val |  bool_val  | float_val  |
-    +------------+------------+------------+------------+------------+------------+
-    | drill.exec.functions.cast_empty_string_to_null | SYSTEM     | null       | null       | false      | null       |
-    | drill.exec.storage.file.partition.column.label | SYSTEM     | null       | dir        | null       | null       |
-    | exec.errors.verbose | SYSTEM     | null       | null       | false      | null       |
-    | exec.java_compiler | SYSTEM     | null       | DEFAULT    | null       | null       |
-    | exec.java_compiler_debug | SYSTEM     | null       | null       | true       | null       |
-    | exec.java_compiler_janino_maxsize | SYSTEM     | 262144     | null       | null       | null       |
-    | exec.queue.timeout_millis | SYSTEM     | 400000     | null       | null       | null       |
-    | planner.add_producer_consumer | SYSTEM     | null       | null       | true       | null       |
-    | planner.affinity_factor | SYSTEM     | null       | null       | null       | 1.2        |
-    | planner.broadcast_threshold | SYSTEM     | 1000000    | null       | null       | null       |
-    | planner.disable_exchanges | SYSTEM     | null       | null       | false      | null       |
-    | planner.enable_broadcast_join | SYSTEM     | null       | null       | true       | null       |
-    | planner.enable_hash_single_key | SYSTEM     | null       | null       | true       | null       |
-    | planner.enable_hashagg | SYSTEM     | null       | null       | true       | null       |
-    | planner.enable_hashjoin | SYSTEM     | null       | null       | true       | null       |
-    | planner.slice_target | SYSTEM     | 100000     | null       | null       | null       |
-    | planner.width.max_per_node | SYSTEM     | 2          | null       | null       | null       |
-    | planner.width.max_per_query | SYSTEM     | 1000       | null       | null       | null       |
-    | store.format | SYSTEM     | null       | parquet    | null       | null       |
-    | store.json.all_text_mode | SYSTEM     | null       | null       | false      | null       |
-    | store.mongo.all_text_mode | SYSTEM     | null       | null       | false      | null       |
-    | store.parquet.block-size | SYSTEM     | 536870912  | null       | null       | null       |
-    | store.parquet.use_new_reader | SYSTEM     | null       | null       | false      | null       |
-    | store.parquet.vector_fill_check_threshold | SYSTEM     | 10         | null       | null       | null       |
-    | store.parquet.vector_fill_threshold | SYSTEM     | 85         | null       | null       | null       |
-    +------------+------------+------------+------------+------------+------------+
-
-{% include startnote.html %}This is a truncated version of the list.{% include endnote.html %}
-
-## Example
-
-This example demonstrates how to use the ALTER SYSTEM command to set the
-`planner.add_producer_consumer` option to “true.” This option enables a
-secondary reading thread to prefetch data from disk.
-
-    0: jdbc:drill:zk=local> alter system set `planner.add_producer_consumer` = true;
-    +------------+------------+
-    |   ok  |  summary   |
-    +------------+------------+
-    | true      | planner.add_producer_consumer updated. |
-    +------------+------------+
-    1 row selected (0.046 seconds)
-
-You can issue a query to see all of the system level settings set to “true.”
-Note that the option type is case-sensitive.
-
-    0: jdbc:drill:zk=local> SELECT name, type, bool_val FROM sys.options WHERE type = 'SYSTEM' and bool_val=true;
-    +------------+------------+------------+
-    |   name    |   type    |  bool_val  |
-    +------------+------------+------------+
-    | exec.java_compiler_debug | SYSTEM     | true      |
-    | planner.enable_mergejoin | SYSTEM     | true      |
-    | planner.enable_broadcast_join | SYSTEM    | true      |
-    | planner.enable_hashagg | SYSTEM   | true      |
-    | planner.add_producer_consumer | SYSTEM    | true      |
-    | planner.enable_hash_single_key | SYSTEM   | true      |
-    | planner.enable_multiphase_agg | SYSTEM    | true      |
-    | planner.enable_streamagg | SYSTEM     | true      |
-    | planner.enable_hashjoin | SYSTEM  | true      |
-    +------------+------------+------------+
-    9 rows selected (0.159 seconds)
-
-  
-

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/030-create-table-as-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/030-create-table-as-command.md b/_docs/sql-reference/sql-commands-summary/030-create-table-as-command.md
deleted file mode 100644
index 573c295..0000000
--- a/_docs/sql-reference/sql-commands-summary/030-create-table-as-command.md
+++ /dev/null
@@ -1,134 +0,0 @@
----
-title: "CREATE TABLE AS (CTAS) command"
-parent: "SQL Commands Summary"
----
-You can create tables in Drill by using the CTAS command:
-
-    CREATE TABLE new_table_name AS <query>;
-
-where query is any valid Drill query. Each table you create must have a unique
-name. You can include an optional column list for the new table. For example:
-
-    create table logtable(transid, prodid) as select transaction_id, product_id from ...
-
-You can store table data in one of three formats:
-
-  * csv
-  * parquet
-  * json
-
-The parquet and json formats can be used to store complex data.
-
-To set the output format for a Drill table, set the `store.format` option with
-the ALTER SYSTEM or ALTER SESSION command. For example:
-
-    alter session set `store.format`='json';
-
-Table data is stored in the location specified by the workspace that is in use
-when you run the CTAS statement. By default, a directory is created, using the
-exact table name specified in the CTAS statement. A .json, .csv, or .parquet
-file inside that directory contains the data.
-
-You can only create new tables in workspaces. You cannot create tables in
-other storage plugins such as Hive and HBase.
-
-You must use a writable (mutable) workspace when creating Drill tables. For
-example:
-
-	"tmp": {
-	      "location": "/tmp",
-	      "writable": true,
-	       }
-
-## Example
-
-The following query returns one row from a JSON file:
-
-	0: jdbc:drill:zk=local> select id, type, name, ppu
-	from dfs.`/Users/brumsby/drill/donuts.json`;
-	+------------+------------+------------+------------+
-	|     id     |    type    |    name    |    ppu     |
-	+------------+------------+------------+------------+
-	| 0001       | donut      | Cake       | 0.55       |
-	+------------+------------+------------+------------+
-	1 row selected (0.248 seconds)
-
-To create and verify the contents of a table that contains this row:
-
-  1. Set the workspace to a writable workspace.
-  2. Set the `store.format` option appropriately.
-  3. Run a CTAS statement that contains the query.
-  4. Go to the directory where the table is stored and check the contents of the file.
-  5. Run a query against the new table.
-
-The following sqlline output captures this sequence of steps.
-
-### Workspace Definition
-
-	"tmp": {
-	      "location": "/tmp",
-	      "writable": true,
-	       }
-
-### ALTER SESSION Command
-
-    alter session set `store.format`='json';
-
-### USE Command
-
-	0: jdbc:drill:zk=local> use dfs.tmp;
-	+------------+------------+
-	|     ok     |  summary   |
-	+------------+------------+
-	| true       | Default schema changed to 'dfs.tmp' |
-	+------------+------------+
-	1 row selected (0.03 seconds)
-
-### CTAS Command
-
-	0: jdbc:drill:zk=local> create table donuts_json as
-	select id, type, name, ppu from dfs.`/Users/brumsby/drill/donuts.json`;
-	+------------+---------------------------+
-	|  Fragment  | Number of records written |
-	+------------+---------------------------+
-	| 0_0        | 1                         |
-	+------------+---------------------------+
-	1 row selected (0.107 seconds)
-
-### File Contents
-
-	administorsmbp7:tmp brumsby$ pwd
-	/tmp
-	administorsmbp7:tmp brumsby$ cd donuts_json
-	administorsmbp7:donuts_json brumsby$ more 0_0_0.json
-	{
-	 "id" : "0001",
-	  "type" : "donut",
-	  "name" : "Cake",
-	  "ppu" : 0.55
-	}
-
-### Query Against New Table
-
-	0: jdbc:drill:zk=local> select * from donuts_json;
-	+------------+------------+------------+------------+
-	|     id     |    type    |    name    |    ppu     |
-	+------------+------------+------------+------------+
-	| 0001       | donut      | Cake       | 0.55       |
-	+------------+------------+------------+------------+
-	1 row selected (0.053 seconds)
-
-### Use a Different Output Format
-
-You can run the same sequence again with a different storage format set for
-the system or session (csv or parquet). For example, if the format is set to
-csv, and you name the table donuts_csv, the resulting file would look like
-this:
-
-	administorsmbp7:tmp brumsby$ cd donuts_csv
-	administorsmbp7:donuts_csv brumsby$ ls
-	0_0_0.csv
-	administorsmbp7:donuts_csv brumsby$ more 0_0_0.csv
-	id,type,name,ppu
-	0001,donut,Cake,0.55
-

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/050-create-view-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/050-create-view-command.md b/_docs/sql-reference/sql-commands-summary/050-create-view-command.md
deleted file mode 100644
index 0d9361c..0000000
--- a/_docs/sql-reference/sql-commands-summary/050-create-view-command.md
+++ /dev/null
@@ -1,197 +0,0 @@
----
-title: "CREATE VIEW command"
-parent: "SQL Commands Summary"
----
-The CREATE VIEW command creates a virtual structure for the result set of a
-stored query. A view can combine data from multiple underlying data sources
-and provide the illusion that all of the data is from one source. You can use
-views to protect sensitive data, for data aggregation, and to hide data
-complexity from users. You can create Drill views from files in your local and
-distributed file systems, Hive, HBase, and MapR-DB tables, as well as from
-existing views or any other available storage plugin data sources.
-
-## Syntax
-
-The CREATE VIEW command supports the following syntax:
-
-    CREATE [OR REPLACE] VIEW [workspace.]view_name [ (column_name [, ...]) ] AS <query>;
-
-Use CREATE VIEW to create a new view. Use CREATE OR REPLACE VIEW to replace an
-existing view with the same name. When you replace a view, the query must
-generate the same set of columns with the same column names and data types.
-
-**Note:** Follow Drill’s rules for identifiers when you name the view. See coming soon...
-
-## Parameters
-
-_workspace_  
-The location where you want the view to exist. By default, the view is created
-in the current workspace. See
-[Workspaces]({{ site.baseurl }}/docs/Workspaces).
-
-_view_name_  
-The name that you give the view. The view must have a unique name. It cannot
-have the same name as any other view or table in the workspace.
-
-_column_name_  
-Optional list of column names in the view. If you do not supply column names,
-they are derived from the query.
-
-_query_  
-A SELECT statement that defines the columns and rows in the view.
-
-## Usage Notes
-
-### Storage
-
-Drill stores views in the location specified by the workspace that you use
-when you run the CREATE VIEW command. If the workspace is not defined, Drill
-creates the view in the current workspace. You must use a writable workspace
-when you create a view. Currently, Drill only supports views created in the
-file system or distributed file system.
-
-The following example shows a writable workspace as defined within the storage
-plugin in the `/tmp` directory of the file system:
-
-    "tmp": {
-          "location": "/tmp",
-          "writable": true,
-           }
-
-Drill stores the view definition in JSON format with the name that you specify
-when you run the CREATE VIEW command, suffixed `by .view.drill`. For example,
-if you create a view named `myview`, Drill stores the view in the designated
-workspace as `myview.view.drill`.
-
-Data Sources
-
-Drill considers data sources to have either a strong schema or a weak schema.  
-
-##### Strong Schema
-
-With the exception of text file data sources, Drill verifies that data sources
-associated with a strong schema contain data types compatible with those used
-in the query. Drill also verifies that the columns referenced in the query
-exist in the underlying data sources. If the columns do not exist, CREATE VIEW
-fails.
-
-#### Weak Schema
-
-Drill does not verify that data sources associated with a weak schema contain
-data types compatible with those used in the query. Drill does not verify if
-columns referenced in a query on a Parquet data source exist, therefore CREATE
-VIEW always succeeds. In the case of JSON files, Drill does not verify if the
-files contain the maps specified in the view.
-
-The following table lists the current categories of schema and the data
-sources associated with each:
-
-<table>
-  <tr>
-    <th></th>
-    <th>Strong Schema</th>
-    <th>Weak Schema</th>
-  </tr>
-  <tr>
-    <td valign="top">Data Sources</td>
-    <td>views<br>hive tables<br>hbase column families<br>text</td>
-    <td>json<br>mongodb<br>hbase column qualifiers<br>parquet</td>
-  </tr>
-</table>
-  
-## Related Commands
-
-After you create a view using the CREATE VIEW command, you can issue the
-following commands against the view:
-
-  * SELECT 
-  * DESCRIBE 
-  * DROP 
-
-{% include startnote.html %}You cannot update, insert into, or delete from a view.{% include endnote.html %}
-
-## Example
-
-This example shows you some steps that you can follow when you want to create
-a view in Drill using the CREATE VIEW command. A workspace named “donuts” was
-created for the steps in this example.
-
-Complete the following steps to create a view in Drill:
-
-  1. Decide which workspace you will use to create the view, and verify that the writable option is set to “true.” You can use an existing workspace, or you can create a new workspace. See [Workspaces](https://cwiki.apache.org/confluence/display/DRILL/Workspaces) for more information.  
-  
-        "workspaces": {
-           "donuts": {
-             "location": "/home/donuts",
-             "writable": true,
-             "defaultInputFormat": null
-           }
-         },
-
-  2. Run SHOW DATABASES to verify that Drill recognizes the workspace.  
-
-        0: jdbc:drill:zk=local> show databases;
-        +-------------+
-        | SCHEMA_NAME |
-        +-------------+
-        | dfs.default |
-        | dfs.root  |
-        | dfs.donuts  |
-        | dfs.tmp   |
-        | cp.default  |
-        | sys       |
-        | INFORMATION_SCHEMA |
-        +-------------+
-
-  3. Use the writable workspace.  
-
-        0: jdbc:drill:zk=local> use dfs.donuts;
-        +------------+------------+
-        |     ok    |  summary   |
-        +------------+------------+
-        | true      | Default schema changed to 'dfs.donuts' |
-        +------------+------------+
-
-  4. Test run the query that you plan to use with the CREATE VIEW command.  
-
-        0: jdbc:drill:zk=local> select id, type, name, ppu from `donuts.json`;
-        +------------+------------+------------+------------+
-        |     id    |   type    |   name    |    ppu    |
-        +------------+------------+------------+------------+
-        | 0001      | donut      | Cake     | 0.55      |
-        +------------+------------+------------+------------+
-
-  5. Run the CREATE VIEW command with the query.  
-
-        0: jdbc:drill:zk=local> create view mydonuts as select id, type, name, ppu from `donuts.json`;
-        +------------+------------+
-        |     ok    |  summary   |
-        +------------+------------+
-        | true      | View 'mydonuts' created successfully in 'dfs.donuts' schema |
-        +------------+------------+
-
-  6. Create a new view in another workspace from the current workspace.  
-
-        0: jdbc:drill:zk=local> create view dfs.tmp.yourdonuts as select id, type, name from `donuts.json`;
-        +------------+------------+
-        |   ok  |  summary   |
-        +------------+------------+
-        | true      | View 'yourdonuts' created successfully in 'dfs.tmp' schema |
-        +------------+------------+
-
-  7. Query the view created in both workspaces.
-
-        0: jdbc:drill:zk=local> select * from mydonuts;
-        +------------+------------+------------+------------+
-        |     id    |   type    |   name    |    ppu    |
-        +------------+------------+------------+------------+
-        | 0001      | donut      | Cake     | 0.55      |
-        +------------+------------+------------+------------+
-         
-         
-        0: jdbc:drill:zk=local> select * from dfs.tmp.yourdonuts;
-        +------------+------------+------------+
-        |   id  |   type    |   name    |
-        +------------+------------+------------+
-        | 0001      | donut     | Cake      |
-        +------------+------------+------------+

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/060-describe-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/060-describe-command.md b/_docs/sql-reference/sql-commands-summary/060-describe-command.md
deleted file mode 100644
index b9eb4f6..0000000
--- a/_docs/sql-reference/sql-commands-summary/060-describe-command.md
+++ /dev/null
@@ -1,99 +0,0 @@
----
-title: "DESCRIBE Command"
-parent: "SQL Commands Summary"
----
-The DESCRIBE command returns information about columns in a table or view.
-
-## Syntax
-
-The DESCRIBE command supports the following syntax:
-
-    DESCRIBE [workspace.]table_name|view_name
-
-## Usage Notes
-
-You can issue the DESCRIBE command against views created in a workspace and
-tables created in Hive, HBase, and MapR-DB. You can issue the DESCRIBE command
-on a table or view from any schema. For example, if you are working in the
-`dfs.myworkspace` schema, you can issue the DESCRIBE command on a view or
-table in another schema. Currently, DESCRIBE does not support tables created
-in a file system.
-
-Drill only supports SQL data types. Verify that all data types in an external
-data source, such as Hive or HBase, map to supported data types in Drill. See
-Drill Data Type Mapping for more information.
-
-## Example
-
-The following example demonstrates the steps that you can follow when you want
-to use the DESCRIBE command to see column information for a view and for Hive
-and HBase tables.
-
-Complete the following steps to use the DESCRIBE command:
-
-  1. Issue the USE command to switch to a particular schema.
-
-        0: jdbc:drill:zk=drilldemo:5181> use hive;
-        +------------+------------+
-        |   ok  |  summary   |
-        +------------+------------+
-        | true      | Default schema changed to 'hive' |
-        +------------+------------+
-        1 row selected (0.025 seconds)
-
-  2. Issue the SHOW TABLES command to see the existing tables in the schema.
-
-        0: jdbc:drill:zk=drilldemo:5181> show tables;
-        +--------------+------------+
-        | TABLE_SCHEMA | TABLE_NAME |
-        +--------------+------------+
-        | hive.default | orders     |
-        | hive.default | products   |
-        +--------------+------------+
-        2 rows selected (0.438 seconds)
-
-  3. Issue the DESCRIBE command on a table.
-
-        0: jdbc:drill:zk=drilldemo:5181> describe orders;
-        +-------------+------------+-------------+
-        | COLUMN_NAME | DATA_TYPE  | IS_NULLABLE |
-        +-------------+------------+-------------+
-        | order_id  | BIGINT    | YES       |
-        | month     | VARCHAR   | YES       |
-        | purchdate   | TIMESTAMP  | YES        |
-        | cust_id   | BIGINT    | YES       |
-        | state     | VARCHAR   | YES       |
-        | prod_id   | BIGINT    | YES       |
-        | order_total | INTEGER | YES       |
-        +-------------+------------+-------------+
-        7 rows selected (0.64 seconds)
-
-  4. Issue the DESCRIBE command on a table in another schema from the current schema.
-
-        0: jdbc:drill:zk=drilldemo:5181> describe hbase.customers;
-        +-------------+------------+-------------+
-        | COLUMN_NAME | DATA_TYPE  | IS_NULLABLE |
-        +-------------+------------+-------------+
-        | row_key   | ANY       | NO        |
-        | address   | (VARCHAR(1), ANY) MAP | NO        |
-        | loyalty   | (VARCHAR(1), ANY) MAP | NO        |
-        | personal  | (VARCHAR(1), ANY) MAP | NO        |
-        +-------------+------------+-------------+
-        4 rows selected (0.671 seconds)
-
-  5. Issue the DESCRIBE command on a view in another schema from the current schema.
-
-        0: jdbc:drill:zk=drilldemo:5181> describe dfs.views.customers_vw;
-        +-------------+------------+-------------+
-        | COLUMN_NAME | DATA_TYPE  | IS_NULLABLE |
-        +-------------+------------+-------------+
-        | cust_id   | BIGINT    | NO        |
-        | name      | VARCHAR   | NO        |
-        | address   | VARCHAR   | NO        |
-        | gender    | VARCHAR   | NO        |
-        | age       | VARCHAR   | NO        |
-        | agg_rev   | VARCHAR   | NO        |
-        | membership  | VARCHAR | NO        |
-        +-------------+------------+-------------+
-        7 rows selected (0.403 seconds)
-

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/070-explain-commands.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/070-explain-commands.md b/_docs/sql-reference/sql-commands-summary/070-explain-commands.md
deleted file mode 100644
index 8ce6432..0000000
--- a/_docs/sql-reference/sql-commands-summary/070-explain-commands.md
+++ /dev/null
@@ -1,156 +0,0 @@
----
-title: "EXPLAIN commands"
-parent: "SQL Commands Summary"
----
-EXPLAIN is a useful tool for examining the steps that a query goes through
-when it is executed. You can use the EXPLAIN output to gain a deeper
-understanding of the parallel processing that Drill queries exploit. You can
-also look at costing information, troubleshoot performance issues, and
-diagnose routine errors that may occur when you run queries.
-
-Drill provides two variations on the EXPLAIN command, one that returns the
-physical plan and one that returns the logical plan. A logical plan takes the
-SQL query (as written by the user and accepted by the parser) and translates
-it into a logical series of operations that correspond to SQL language
-constructs (without defining the specific algorithms that will be implemented
-to run the query). A physical plan translates the logical plan into a specific
-series of steps that will be used when the query runs. For example, a logical
-plan may indicate a join step in general and classify it as inner or outer,
-but the corresponding physical plan will indicate the specific type of join
-operator that will run, such as a merge join or a hash join. The physical plan
-is operational and reveals the specific _access methods_ that will be used for
-the query.
-
-An EXPLAIN command for a query that is run repeatedly under the exact same
-conditions against the same data will return the same plan. However, if you
-change a configuration option, for example, or update the tables or files that
-you are selecting from, you are likely to see plan changes.
-
-## EXPLAIN Syntax
-
-The EXPLAIN command supports the following syntax:
-
-    explain plan [ including all attributes ] [ with implementation | without implementation ] for <query> ;
-
-where `query` is any valid SELECT statement supported by Drill.
-
-##### INCLUDING ALL ATTRIBUTES
-
-This option returns costing information. You can use this option for both
-physical and logical plans.
-
-#### WITH IMPLEMENTATION | WITHOUT IMPLEMENTATION
-
-These options return the physical and logical plan information, respectively.
-The default is physical (WITH IMPLEMENTATION).
-
-## EXPLAIN for Physical Plans
-
-The EXPLAIN PLAN FOR <query> command returns the chosen physical execution
-plan for a query statement without running the query. You can use this command
-to see what kind of execution operators Drill implements. For example, you can
-find out what kind of join algorithm is chosen when tables or files are
-joined. You can also use this command to analyze errors and troubleshoot
-queries that do not run. For example, if you run into a casting error, the
-query plan text may help you isolate the problem.
-
-Use the following syntax:
-
-    explain plan for <query> ;
-
-The following set command increases the default text display (number of
-characters). By default, most of the plan output is not displayed.
-
-    0: jdbc:drill:zk=local> !set maxwidth 10000
-
-Do not use a semicolon to terminate set commands.
-
-For example, here is the top portion of the explain output for a
-COUNT(DISTINCT) query on a JSON file:
-
-    0: jdbc:drill:zk=local> !set maxwidth 10000
-	0: jdbc:drill:zk=local> explain plan for select type t, count(distinct id) from dfs.`/home/donuts/donuts.json` where type='donut' group by type;
-	+------------+------------+
-	|   text    |   json    |
-	+------------+------------+
-	| 00-00 Screen
-	00-01   Project(t=[$0], EXPR$1=[$1])
-	00-02       Project(t=[$0], EXPR$1=[$1])
-	00-03       HashAgg(group=[{0}], EXPR$1=[COUNT($1)])
-	00-04           HashAgg(group=[{0, 1}])
-	00-05           SelectionVectorRemover
-	00-06               Filter(condition=[=($0, 'donut')])
-	00-07               Scan(groupscan=[EasyGroupScan [selectionRoot=/home/donuts/donuts.json, numFiles=1, columns=[`type`, `id`], files=[file:/home/donuts/donuts.json]]])...
-	...
-
-Read the text output from bottom to top to understand the sequence of
-operators that will execute the query. Note that the physical plan starts with
-a scan of the JSON file that is being queried. The selected columns are
-projected and filtered, then the aggregate function is applied.
-
-The EXPLAIN text output is followed by detailed JSON output, which is reusable
-for submitting the query via Drill APIs.
-
-	| {
-	  "head" : {
-	    "version" : 1,
-	    "generator" : {
-	      "type" : "ExplainHandler",
-	      "info" : ""
-	    },
-	    "type" : "APACHE_DRILL_PHYSICAL",
-	    "options" : [ ],
-	    "queue" : 0,
-	    "resultMode" : "EXEC"
-	  },
-	....
-
-## Costing Information
-
-Add the INCLUDING ALL ATTRIBUTES option to the EXPLAIN command to see cost
-estimates for the query plan. For example:
-
-	0: jdbc:drill:zk=local> !set maxwidth 10000
-	0: jdbc:drill:zk=local> explain plan including all attributes for select * from dfs.`/home/donuts/donuts.json` where type='donut';
-	+------------+------------+
-	|   text    |   json    |
-	+------------+------------+
-	| 00-00 Screen: rowcount = 1.0, cumulative cost = {5.1 rows, 21.1 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 889
-	00-01   Project(*=[$0]): rowcount = 1.0, cumulative cost = {5.0 rows, 21.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 888
-	00-02       Project(T1¦¦*=[$0]): rowcount = 1.0, cumulative cost = {4.0 rows, 17.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 887
-	00-03       SelectionVectorRemover: rowcount = 1.0, cumulative cost = {3.0 rows, 13.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 886
-	00-04           Filter(condition=[=($1, 'donut')]): rowcount = 1.0, cumulative cost = {2.0 rows, 12.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 885
-	00-05           Project(T1¦¦*=[$0], type=[$1]): rowcount = 1.0, cumulative cost = {1.0 rows, 8.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 884
-	00-06               Scan(groupscan=[EasyGroupScan [selectionRoot=/home/donuts/donuts.json, numFiles=1, columns=[`*`], files=[file:/home/donuts/donuts.json]]]): rowcount = 1.0, cumulative cost = {0.0 rows, 0.0 cpu, 0.0 io, 0.0 network, 0.0 memory}, id = 883
-
-## EXPLAIN for Logical Plans
-
-To return the logical plan for a query (again, without actually running the
-query), use the EXPLAIN PLAN WITHOUT IMPLEMENTATION syntax:
-
-    explain plan without implementation for <query> ;
-
-For example:
-
-	0: jdbc:drill:zk=local> explain plan without implementation for select type t, count(distinct id) from dfs.`/home/donuts/donuts.json` where type='donut' group by type;
-	+------------+------------+
-	|   text    |   json    |
-	+------------+------------+
-	| DrillScreenRel
-	  DrillProjectRel(t=[$0], EXPR$1=[$1])
-	    DrillAggregateRel(group=[{0}], EXPR$1=[COUNT($1)])
-	    DrillAggregateRel(group=[{0, 1}])
-	        DrillFilterRel(condition=[=($0, 'donut')])
-	        DrillScanRel(table=[[dfs, /home/donuts/donuts.json]], groupscan=[EasyGroupScan [selectionRoot=/home/donuts/donuts.json, numFiles=1, columns=[`type`, `id`], files=[file:/home/donuts/donuts.json]]]) | {
-	  | {
-	  "head" : {
-	    "version" : 1,
-	    "generator" : {
-	    "type" : "org.apache.drill.exec.planner.logical.DrillImplementor",
-	    "info" : ""
-	    },
-	    "type" : "APACHE_DRILL_LOGICAL",
-	    "options" : null,
-	    "queue" : 0,
-	    "resultMode" : "LOGICAL"
-	  },...

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/080-select.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/080-select.md b/_docs/sql-reference/sql-commands-summary/080-select.md
deleted file mode 100644
index 4ffd4b3..0000000
--- a/_docs/sql-reference/sql-commands-summary/080-select.md
+++ /dev/null
@@ -1,178 +0,0 @@
----
-title: "SELECT Statements"
-parent: "SQL Commands Summary"
----
-Drill supports the following ANSI standard clauses in the SELECT statement:
-
-  * WITH clause
-  * SELECT list
-  * FROM clause
-  * WHERE clause
-  * GROUP BY clause
-  * HAVING clause
-  * ORDER BY clause (with an optional LIMIT clause)
-
-You can use the same SELECT syntax in the following commands:
-
-  * CREATE TABLE AS (CTAS)
-  * CREATE VIEW
-
-INSERT INTO SELECT is not yet supported.
-
-## Column Aliases
-
-You can use named column aliases in the SELECT list to provide meaningful
-names for regular columns and computed columns, such as the results of
-aggregate functions. See the section on running queries for examples.
-
-You cannot reference column aliases in the following clauses:
-
-  * WHERE
-  * GROUP BY
-  * HAVING
-
-Because Drill works with schema-less data sources, you cannot use positional
-aliases (1, 2, etc.) to refer to SELECT list columns, except in the ORDER BY
-clause.
-
-## UNION ALL Set Operator
-
-Drill supports the UNION ALL set operator to combine two result sets. The
-distinct UNION operator is not yet supported.
-
-The EXCEPT, EXCEPT ALL, INTERSECT, and INTERSECT ALL operators are not yet
-supported.
-
-## Joins
-
-Drill supports ANSI standard joins in the FROM and WHERE clauses:
-
-  * Inner joins
-  * Left, full, and right outer joins
-
-The following types of join syntax are supported:
-
-Join type| Syntax  
----|---  
-Join condition in WHERE clause|FROM table1, table 2 WHERE table1.col1=table2.col1  
-USING join in FROM clause|FROM table1 JOIN table2 USING(col1, ...)  
-ON join in FROM clause|FROM table1 JOIN table2 ON table1.col1=table2.col1  
-NATURAL JOIN in FROM clause|FROM table 1 NATURAL JOIN table 2  
-
-Cross-joins are not yet supported. You must specify a join condition when more
-than one table is listed in the FROM clause.
-
-Non-equijoins are supported if the join also contains an equality condition on
-the same two tables as part of a conjunction:
-
-    table1.col1 = table2.col1 AND table1.c2 < table2.c2
-
-This restriction applies to both inner and outer joins.
-
-## Subqueries
-
-You can use the following subquery operators in Drill queries. These operators
-all return Boolean results.
-
-  * ALL
-  * ANY
-  * EXISTS
-  * IN
-  * SOME
-
-In general, correlated subqueries are supported. EXISTS and NOT EXISTS
-subqueries that do not contain a correlation join are not yet supported.
-
-## WITH Clause
-
-The WITH clause is an optional clause used to contain one or more common table
-expressions (CTE) where each CTE defines a temporary table that exists for the
-duration of the query. Each subquery in the WITH clause specifies a table
-name, an optional list of column names, and a SELECT statement.
-
-## Syntax
-
-The WITH clause supports the following syntax:
-
-    [ WITH with_subquery [, ...] ]
-    where with_subquery is:
-    with_subquery_table_name [ ( column_name [, ...] ) ] AS ( query ) 
-
-## Parameters
-
-_with_subquery_table_name_
-
-A unique name for a temporary table that defines the results of a WITH clause
-subquery. You cannot use duplicate names within a single WITH clause. You must
-give each subquery a table name that can be referenced in the FROM clause.
-
-_column_name_
-
-An optional list of output column names for the WITH clause subquery,
-separated by commas. The number of column names specified must be equal to or
-less than the number of columns defined by the subquery.
-
-_query_
-
-Any SELECT query that Drill supports. See
-[SELECT]({{ site.baseurl }}/docs/SELECT+Statements).
-
-## Usage Notes
-
-Use the WITH clause to efficiently define temporary tables that Drill can
-access throughout the execution of a single query. The WITH clause is
-typically a simpler alternative to using subqueries in the main body of the
-SELECT statement. In some cases, Drill can evaluate a WITH subquery once and
-reuse the results for query optimization.
-
-You can use a WITH clause in the following SQL statements:
-
-  * SELECT (including subqueries within SELECT statements)
-
-  * CREATE TABLE AS
-
-  * CREATE VIEW
-
-  * EXPLAIN
-
-You can reference the temporary tables in the FROM clause of the query. If the
-FROM clause does not reference any tables defined by the WITH clause, Drill
-ignores the WITH clause and executes the query as normal.
-
-Drill can only reference a table defined by a WITH clause subquery in the
-scope of the SELECT query that the WITH clause begins. For example, you can
-reference such a table in the FROM clause of a subquery in the SELECT list,
-WHERE clause, or HAVING clause. You cannot use a WITH clause in a subquery and
-reference its table in the FROM clause of the main query or another subquery.
-
-You cannot specify another WITH clause inside a WITH clause subquery.
-
-For example, the following query includes a forward reference to table t2 in
-the definition of table t1:
-
-## Example
-
-The following example shows the WITH clause used to create a WITH query named
-`emp_data` that selects all of the rows from the `employee.json` file. The
-main query selects the `full_name, position_title, salary`, and `hire_date`
-rows from the `emp_data` temporary table (created from the WITH subquery) and
-orders the results by the hire date. The `emp_data` table only exists for the
-duration of the query.
-
-**Note:** The `employee.json` file is included with the Drill installation. It is located in the `cp.default` workspace which is configured by default. 
-
-    0: jdbc:drill:zk=local> with emp_data as (select * from cp.`employee.json`) select full_name, position_title, salary, hire_date from emp_data order by hire_date limit 10;
-    +------------------+-------------------------+------------+-----------------------+
-    | full_name        | position_title          |   salary   | hire_date             |
-    +------------------+-------------------------+------------+-----------------------+
-    | Bunny McCown     | Store Assistant Manager | 8000.0     | 1993-05-01 00:00:00.0 |
-    | Danielle Johnson | Store Assistant Manager | 8000.0     | 1993-05-01 00:00:00.0 |
-    | Dick Brummer     | Store Assistant Manager | 7900.0     | 1993-05-01 00:00:00.0 |
-    | Gregory Whiting  | Store Assistant Manager | 10000.0    | 1993-05-01 00:00:00.0 |
-    | Juanita Sharp    | HQ Human Resources      | 6700.0     | 1994-01-01 00:00:00.0 |
-    | Sheri Nowmer     | President               | 80000.0    | 1994-12-01 00:00:00.0 |
-    | Rebecca Kanagaki | VP Human Resources      | 15000.0    | 1994-12-01 00:00:00.0 |
-    | Shauna Wyro      | Store Manager           | 15000.0    | 1994-12-01 00:00:00.0 |
-    | Roberta Damstra  | VP Information Systems  | 25000.0    | 1994-12-01 00:00:00.0 |
-    | Pedro Castillo   | VP Country Manager      | 35000.0    | 1994-12-01 00:00:00.0 |
-    +------------+----------------+--------------+------------------------------------+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/090-show-databases-and-show-schemas.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/090-show-databases-and-show-schemas.md b/_docs/sql-reference/sql-commands-summary/090-show-databases-and-show-schemas.md
deleted file mode 100644
index 924631f..0000000
--- a/_docs/sql-reference/sql-commands-summary/090-show-databases-and-show-schemas.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-title: "SHOW DATABASES AND SHOW SCHEMAS Command"
-parent: "SQL Commands Summary"
----
-The SHOW DATABASES and SHOW SCHEMAS commands generate a list of available Drill schemas that you can query.
-
-## Syntax
-
-The SHOW DATABASES and SHOW SCHEMAS commands support the following syntax:
-
-    SHOW DATABASES;
-    SHOW SCHEMAS;
-
-{% include startnote.html %}These commands generate the same results.{% include endnote.html %}
-
-## Usage Notes
-
-You may want to run the SHOW DATABASES or SHOW SCHEMAS command to see a list of the configured storage plugins and workspaces in Drill before you issue the USE command to switch to a particular schema for your queries.
-
-In Drill, a database or schema is a configured storage plugin instance or a configured storage plugin instance with a configured workspace. For example, dfs.donuts where dfs is the file system configured as a storage plugin instance, and donuts is a configured workspace.
-
-You can configure and use multiple storage plugins and workspaces in Drill.  See [Storage Plugin Registration]({{ site.baseurl }}/docs/storage-plugin-registration) and [Workspaces]({{ site.baseurl }}/docs/workspaces).
-
-## Example
-
-The following example uses the SHOW DATABASES and SHOW SCHEMAS commands to generate a list of the available schemas in Drill. Some of the results that display are specific to all Drill installations, such as `cp.default` and `dfs.default`, while others vary based on your specific storage plugin and workspace configurations.
-
-	0: jdbc:drill:zk=local> show databases;
-	+-------------+
-	| SCHEMA_NAME |
-	+-------------+
-	| dfs.default |
-	| dfs.root  |
-	| dfs.donuts  |
-	| dfs.tmp   |
-	| dfs.customers |
-	| dfs.yelp  |
-	| cp.default  |
-	| sys       |
-	| INFORMATION_SCHEMA |
-	+-------------+
-	9 rows selected (0.07 seconds)
-	 
-	 
-	0: jdbc:drill:zk=local> show schemas;
-	+-------------+
-	| SCHEMA_NAME |
-	+-------------+
-	| dfs.default |
-	| dfs.root  |
-	| dfs.donuts  |
-	| dfs.tmp   |
-	| dfs.customers |
-	| dfs.yelp  |
-	| cp.default  |
-	| sys       |
-	| INFORMATION_SCHEMA |
-	+-------------+
-	9 rows selected (0.058 seconds)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/100-show-files.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/100-show-files.md b/_docs/sql-reference/sql-commands-summary/100-show-files.md
deleted file mode 100644
index 1fcf395..0000000
--- a/_docs/sql-reference/sql-commands-summary/100-show-files.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-title: "SHOW FILES Command"
-parent: "SQL Commands Summary"
----
-The SHOW FILES command provides a quick report of the file systems that are
-visible to Drill for query purposes. This command is unique to Apache Drill.
-
-## Syntax
-
-The SHOW FILES command supports the following syntax.
-
-    SHOW FILES [ FROM filesystem.directory_name | IN filesystem.directory_name ];
-
-The FROM or IN clause is required if you do not specify a default file system
-first. You can do this with the USE command. FROM and IN are synonyms.
-
-The directory name is optional. (If the directory name is a Drill reserved
-word, you must use back ticks around the name.)
-
-The command returns standard Linux `stat` information for each file or
-directory, such as permissions, owner, and group values. This information is
-not specific to Drill.
-
-## Examples
-
-The following example returns information about directories and files in the
-local (`dfs`) file system.
-
-	0: jdbc:drill:> use dfs;
-	 
-	+------------+------------+
-	|     ok     |  summary   |
-	+------------+------------+
-	| true       | Default schema changed to 'dfs' |
-	+------------+------------+
-	1 row selected (0.318 seconds)
-	 
-	0: jdbc:drill:> show files;
-	+------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
-	|    name    | isDirectory |   isFile   |   length   |   owner    |   group    | permissions | accessTime | modificationTime |
-	+------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
-	| user       | true        | false      | 1          | mapr       | mapr       | rwxr-xr-x   | 2014-07-30 21:37:06.0 | 2014-07-31 22:15:53.193 |
-	| backup.tgz | false       | true       | 36272      | root       | root       | rw-r--r--   | 2014-07-31 22:09:13.0 | 2014-07-31 22:09:13.211 |
-	| JSON       | true        | false      | 1          | root       | root       | rwxr-xr-x   | 2014-07-31 15:22:42.0 | 2014-08-04 15:43:07.083 |
-	| scripts    | true        | false      | 3          | root       | root       | rwxr-xr-x   | 2014-07-31 22:10:51.0 | 2014-08-04 18:23:09.236 |
-	| temp       | true        | false      | 2          | root       | root       | rwxr-xr-x   | 2014-08-01 20:07:37.0 | 2014-08-01 20:09:42.595 |
-	| hbase      | true        | false      | 10         | mapr       | mapr       | rwxr-xr-x   | 2014-07-30 21:36:08.0 | 2014-08-04 18:31:13.778 |
-	| tables     | true        | false      | 0          | root       | root       | rwxrwxrwx   | 2014-07-31 22:14:35.0 | 2014-08-04 15:42:43.415 |
-	| CSV        | true        | false      | 4          | root       | root       | rwxrwxrwx   | 2014-07-31 17:34:53.0 | 2014-08-04
-	...
-
-The following example shows the files in a specific directory in the `dfs`
-file system:
-
-	0: jdbc:drill:> show files in dfs.CSV;
-	 
-	+------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
-	|    name    | isDirectory |   isFile   |   length   |   owner    |   group    | permissions | accessTime | modificationTime |
-	+------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
-	| customers.csv | false       | true       | 62011      | root       | root       | rw-r--r--   | 2014-08-04 18:30:39.0 | 2014-08-04 18:30:39.314 |
-	| products.csv.small | false       | true       | 34972      | root       | root       | rw-r--r--   | 2014-07-31 23:58:42.0 | 2014-07-31 23:59:16.849 |
-	| products.csv | false       | true       | 34972      | root       | root       | rw-r--r--   | 2014-08-01 06:39:34.0 | 2014-08-04 15:58:09.325 |
-	| products.csv.bad | false       | true       | 62307      | root       | root       | rw-r--r--   | 2014-08-04 15:58:02.0 | 2014-08-04 15:58:02.612 |
-	+------------+-------------+------------+------------+------------+------------+-------------+------------+------------------+
-	4 rows selected (0.165 seconds)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_docs/sql-reference/sql-commands-summary/110-show-tables-command.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-commands-summary/110-show-tables-command.md b/_docs/sql-reference/sql-commands-summary/110-show-tables-command.md
deleted file mode 100644
index c55975f..0000000
--- a/_docs/sql-reference/sql-commands-summary/110-show-tables-command.md
+++ /dev/null
@@ -1,136 +0,0 @@
----
-title: "SHOW TABLES Command"
-parent: "SQL Commands Summary"
----
-The SHOW TABLES command returns a list of views created within a schema. It
-also returns the tables that exist in Hive, HBase, and MapR-DB when you have
-these data sources configured as storage plugin instances. See[ Storage Plugin
-Registration]({{ site.baseurl }}/docs/storage-plugin-registration).
-
-## Syntax
-
-The SHOW TABLES command supports the following syntax:
-
-    SHOW TABLES;
-
-## Usage Notes
-
-First issue the USE command to identify the schema for which you want to view
-tables or views. For example, the following USE statement tells Drill that you
-only want information from the `dfs.myviews` schema:
-
-    USE dfs.myviews;
-
-In this example, “`myviews`” is a workspace created withing an instance of the
-`dfs` storage plugin.
-
-When you use a particular schema and then issue the SHOW TABLES command, Drill
-returns the tables and views within that schema.
-
-#### Limitations
-
-  * You can create and query tables within the file system, however Drill does not return these tables when you issue the SHOW TABLES command. You can issue the [SHOW FILES ]({{ site.baseurl }}/docs/show-files-command)command to see a list of all files, tables, and views, including those created in Drill. 
-
-  * You cannot create Hive, HBase, or MapR-DB tables in Drill. 
-
-## Examples
-
-The following examples demonstrate the steps that you can follow when you want
-to issue the SHOW TABLES command on the file system, Hive, and HBase.  
-  
-Complete the following steps to see views that exist in a file system and
-tables that exist in Hive and HBase data sources:
-
-  1. Issue the SHOW SCHEMAS command to see a list of available schemas.
-
-        0: jdbc:drill:zk=drilldemo:5181> show schemas;
-        +-------------+
-        | SCHEMA_NAME |
-        +-------------+
-        | hive.default |
-        | dfs.reviews |
-        | dfs.flatten |
-        | dfs.default |
-        | dfs.root  |
-        | dfs.logs  |
-        | dfs.myviews   |
-        | dfs.clicks  |
-        | dfs.tmp   |
-        | sys       |
-        | hbase     |
-        | INFORMATION_SCHEMA |
-        | s3.twitter  |
-        | s3.reviews  |
-        | s3.default  |
-        +-------------+
-        15 rows selected (0.072 seconds)
-
-  2. Issue the USE command to switch to a particular schema. When you use a particular schema, Drill searches or queries within that schema only. 
-
-        0: jdbc:drill:zk=drilldemo:5181> use dfs.myviews;
-        +------------+------------+
-        |   ok  |  summary   |
-        +------------+------------+
-        | true      | Default schema changed to 'dfs.myviews' |
-        +------------+------------+
-        1 row selected (0.025 seconds)
-
-  3. Issue the SHOW TABLES command to see the views or tables that exist within workspace.
-
-        0: jdbc:drill:zk=drilldemo:5181> show tables;
-        +--------------+------------+
-        | TABLE_SCHEMA | TABLE_NAME |
-        +--------------+------------+
-        | dfs.myviews   | logs_vw   |
-        | dfs.myviews   | customers_vw |
-        | dfs.myviews   | s3_review_vw |
-        | dfs.myviews   | clicks_vw  |
-        | dfs.myviews   | nestedclickview |
-        | dfs.myviews   | s3_user_vw |
-        | dfs.myviews   | s3_bus_vw  |
-        +--------------+------------+
-        7 rows selected (0.499 seconds)
-        0: jdbc:drill:zk=drilldemo:5181>
-
-  4. Switch to the Hive schema and issue the SHOW TABLES command to see the Hive tables that exist.
-
-        0: jdbc:drill:zk=drilldemo:5181> use hive;
-        +------------+------------+
-        |   ok  |  summary   |
-        +------------+------------+
-        | true      | Default schema changed to 'hive' |
-        +------------+------------+
-        1 row selected (0.043 seconds)
-         
-        0: jdbc:drill:zk=drilldemo:5181> show tables;
-        +--------------+------------+
-        | TABLE_SCHEMA | TABLE_NAME |
-        +--------------+------------+
-        | hive.default | orders     |
-        | hive.default | products   |
-        +--------------+------------+
-        2 rows selected (0.552 seconds)
-
-  5. Switch to the HBase schema and issue the SHOW TABLES command to see the HBase tables that exist within the schema.
-
-        0: jdbc:drill:zk=drilldemo:5181> use hbase;
-        +------------+------------+
-        |   ok  |  summary   |
-        +------------+------------+
-        | true      | Default schema changed to 'hbase' |
-        +------------+------------+
-        1 row selected (0.043 seconds)
-         
-         
-        0: jdbc:drill:zk=drilldemo:5181> show tables;
-        +--------------+------------+
-        | TABLE_SCHEMA | TABLE_NAME |
-        +--------------+------------+
-        | hbase     | customers  |
-        +--------------+------------+
-        1 row selected (0.412 seconds)
-
-  
-
-  
-


[12/50] [abbrv] drill git commit: more edits TDC file

Posted by ts...@apache.org.
more edits TDC file


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

Branch: refs/heads/gh-pages
Commit: 4488e898b9f9458be987b94b53e7715a0862de38
Parents: 404a042
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Apr 29 16:36:49 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Apr 29 16:36:49 2015 -0700

----------------------------------------------------------------------
 .../using-odbc-on-windows/010-installing-the-driver-on-windows.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/4488e898/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
index 7435779..ab4f040 100755
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
@@ -51,7 +51,7 @@ The MapR Drill ODBC driver installer automatically installs the TDC file if the
   2. When the installation completes, press any key to continue.   
 For example, you can press the SPACEBAR key.
 
-If the installation of the TDC file fails, this is likely due to your Tableau repository being in location other than the default one.  In this case, manually copy the My Tableau Repository to C:\Users\<user>\Documents\My Tableau Repository.
+If the installation of the TDC file fails, this is likely due to your Tableau repository being in location other than the default one.  In this case, manually copy the My Tableau Repository to C:\Users\<user>\Documents\My Tableau Repository. Repeat the procedure to install the MapRDrillODBC.TDC file manually.
 
 
 #### What's Next? Go to [Step 2. Configure ODBC Connections to Drill Data Sources]({{ site.baseurl }}/docs/configuring-connections-on-windows).


[09/50] [abbrv] drill git commit: MD-123

Posted by ts...@apache.org.
MD-123


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

Branch: refs/heads/gh-pages
Commit: 9ea1dc5bb6705d662fbbe51dadd33fd4345c523e
Parents: ec19d2e
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Apr 29 16:16:42 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Apr 29 16:16:42 2015 -0700

----------------------------------------------------------------------
 .../010-installing-the-driver-on-windows.md             | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/9ea1dc5b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
index 94a62b4..f449ab2 100755
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
@@ -45,8 +45,10 @@ when using Tableau.
 
 If you install Tableau after you install the MapR Drill ODBC driver, you must
 install the Tableau TDC FIle. When Tableau is already installed on the
-machine, the TDC file is installed automatically with the MapR Drill ODBC
-driver.
+machine, the TDC file is installed automatically when you install the MapR Drill ODBC driver.
+
+### Installing the TDC File
+The MapR Drill ODBC driver installer installs the TDC file automatically. If you installed the MapR Drill ODBC driver first and then installed Tableau, you need to install the TDC file manually. 
 
 **To install the MapRDrillODBC.TDC file manually:**
 
@@ -54,5 +56,9 @@ driver.
   2. When the installation completes, press any key to continue.   
 For example, you can press the SPACEBAR key.
 
-#### What's Next? Go to [Step 2. Configure ODBC Connections to Drill Data Sources]({{ site.baseurl }}/docs/configuring-connections-on-windows).
+If the installation of the Tableau datasource connection (TDC) file fails, this is likely due to your Tableau repository being in a different location.  In this case, you should manually copy the TDC file to one of the following locations:
 
+* For Tableau Desktop, save the file to the Datasources folder in the My Tableau Repository. By default, the My Tableau Repository is located in C:\Users\<user>\Documents\My Tableau Repository.
+* For Tableau Server, save the file to the C:\ProgramData\Tableau\Tableau Server\data\tabsvc\vizqlserver\Datasources directory.
+
+#### What's Next? Go to [Step 2. Configure ODBC Connections to Drill Data Sources]({{ site.baseurl }}/docs/configuring-connections-on-windows).


[18/50] [abbrv] drill git commit: Merge branch 'gh-pages' of https://github.com/tshiran/drill into gh-pages

Posted by ts...@apache.org.
Merge branch 'gh-pages' of https://github.com/tshiran/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/1aaf4004
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/1aaf4004
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/1aaf4004

Branch: refs/heads/gh-pages
Commit: 1aaf4004a486cca61594bb71b9eceb0be9f6915d
Parents: 81ee68a 4b6f3dd
Author: Tomer Shiran <ts...@gmail.com>
Authored: Wed Apr 29 19:55:37 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Wed Apr 29 19:55:37 2015 -0700

----------------------------------------------------------------------
 _data/docs.json                                 | 168 +++++++++++++-----
 _docs/connect-a-data-source/020-plugin-reg.md   |  24 ---
 .../020-storage-plugin-registration.md          |  24 +++
 _docs/connect-a-data-source/030-plugin-conf.md  | 130 --------------
 .../030-storage-plugin-configuration.md         |   5 +
 ...storage-plugin-configuration-introduction.md | 133 +++++++++++++++
 .../050-file-system-storage-plugin.md           |  64 +++++++
 _docs/connect-a-data-source/050-reg-fs.md       |  64 -------
 .../060-hbase-storage-plugin.md                 |  37 ++++
 _docs/connect-a-data-source/060-reg-hbase.md    |  37 ----
 .../070-hive-storage-plugin.md                  |  77 +++++++++
 _docs/connect-a-data-source/070-reg-hive.md     |  77 ---------
 _docs/connect-a-data-source/080-default-frmt.md |  69 --------
 .../080-drill-default-input-format.md           |  69 ++++++++
 _docs/connect-a-data-source/090-mongo-plugin.md | 169 -------------------
 .../090-mongodb-plugin-for-apache-drill.md      | 162 ++++++++++++++++++
 .../connect-a-data-source/100-mapr-db-format.md |  34 ++++
 .../connect-a-data-source/100-mapr-db-plugin.md |  34 ----
 .../010-installing-the-driver-on-windows.md     |  13 +-
 .../nested-data-functions/020-kvgen.md          |  19 ++-
 20 files changed, 749 insertions(+), 660 deletions(-)
----------------------------------------------------------------------



[04/50] [abbrv] drill git commit: DRILL-994

Posted by ts...@apache.org.
DRILL-994


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

Branch: refs/heads/gh-pages
Commit: fdf289b2e5685d35e3cab0a4af9f64cdade8bbad
Parents: e3856b4
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Apr 29 15:07:08 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Apr 29 15:07:08 2015 -0700

----------------------------------------------------------------------
 _docs/connect-a-data-source/030-plugin-conf.md | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/fdf289b2/_docs/connect-a-data-source/030-plugin-conf.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/030-plugin-conf.md b/_docs/connect-a-data-source/030-plugin-conf.md
index 444b0a6..36991ab 100644
--- a/_docs/connect-a-data-source/030-plugin-conf.md
+++ b/_docs/connect-a-data-source/030-plugin-conf.md
@@ -127,4 +127,9 @@ For example, this command creates a plugin named myplugin for reading files of a
 
     curl -X POST -/json" -d '{"name":"myplugin", "config": {"type": "file", "enabled": false, "connection": "file:///", "workspaces": { "root": { "location": "/", "writable": false, "defaultInputFormat": null}}, "formats": null}}' http://localhost:8047/storage/myplugin.json
 
+## Bootstrapping a Storage Plugin
+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.
+
 


[17/50] [abbrv] drill git commit: Re-enabled _drafts folder

Posted by ts...@apache.org.
Re-enabled _drafts folder


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

Branch: refs/heads/gh-pages
Commit: 81ee68a828034a7c50dbb0492e571175503fa832
Parents: 5716a41
Author: Tomer Shiran <ts...@gmail.com>
Authored: Wed Apr 29 19:52:00 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Wed Apr 29 19:52:00 2015 -0700

----------------------------------------------------------------------
 .gitignore                                      |  1 -
 _layouts.old/default.html                       | 15 -------
 _layouts.old/docpage.html                       | 25 -----------
 _layouts.old/page.html                          |  9 ----
 _layouts.old/post.html                          | 45 --------------------
 blog/_drafts/drill-0.9-released.md              | 32 ++++++++++++++
 ...-parquet-graudates-to-a-top-level-project.md | 12 +++---
 blog/_posts/2015-05-04-drill-0.9-released.md    | 32 --------------
 8 files changed, 38 insertions(+), 133 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/81ee68a8/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index bdf6a75..fca57d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 _site/*
-blog/_drafts/*
 .sass-cache/*
 .DS_Store

http://git-wip-us.apache.org/repos/asf/drill/blob/81ee68a8/_layouts.old/default.html
----------------------------------------------------------------------
diff --git a/_layouts.old/default.html b/_layouts.old/default.html
deleted file mode 100644
index 3d0342d..0000000
--- a/_layouts.old/default.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-{% include head.html %}
-
-<body onResize="resized();">
-<div class="page-wrap">
-  {% include menu.html %}
-  {{ content }}
-</div>
-
-{% include footer.html %}
-{% include scripts.html %}
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/drill/blob/81ee68a8/_layouts.old/docpage.html
----------------------------------------------------------------------
diff --git a/_layouts.old/docpage.html b/_layouts.old/docpage.html
deleted file mode 100644
index 9beb032..0000000
--- a/_layouts.old/docpage.html
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: default
----
-
-
-<link href="{{ site.baseurl }}/css/docpage.css" rel="stylesheet" type="text/css">
-
-
-{% include breadcrumbs.html %}
-{% include doc_toc_categories.html %}
-
-<div class="int_title">
-<h1>{{ page.title }}</h1>
-{% if page.description %}<p>{{ page.description }}</p>{% endif %}
-</div>
-
-<div class="int_text" align="left">
-    {% include doc_toc.html %}
-  <div class="main-content">
-    <a class="edit-link" href="https://github.com/apache/drill/blob/gh-pages/TODO{{ page.path | remove: 'repo/' }}" target="_blank"><i class="fa fa-pencil-square-o"></i></a>
-    {{ content }}
-  </div>
-  {% include doc_nav.html %}
-</div>
-

http://git-wip-us.apache.org/repos/asf/drill/blob/81ee68a8/_layouts.old/page.html
----------------------------------------------------------------------
diff --git a/_layouts.old/page.html b/_layouts.old/page.html
deleted file mode 100644
index 31d2871..0000000
--- a/_layouts.old/page.html
+++ /dev/null
@@ -1,9 +0,0 @@
----
-layout: default
----
-<div class="int_title">
-<h1>{{ page.title }}</h1>
-{% if page.description %}<p>{{ page.description }}</p>{% endif %}
-</div>
-
-<div class="int_text" align="left">{{ content }}</div>

http://git-wip-us.apache.org/repos/asf/drill/blob/81ee68a8/_layouts.old/post.html
----------------------------------------------------------------------
diff --git a/_layouts.old/post.html b/_layouts.old/post.html
deleted file mode 100644
index 070bf62..0000000
--- a/_layouts.old/post.html
+++ /dev/null
@@ -1,45 +0,0 @@
----
-layout: default
----
-<div class="post int_text">
-
-  <header class="post-header">
-    <h1 class="post-title">{{ page.title }}</h1>
-    <p class="post-meta">
-    {% if page.authors.size > 1 %}
-    <strong>Authors:</strong>
-    <ul>
-      {% for alias in page.authors %}
-        {% assign author = site.data.authors[alias] %}
-        <li>{{ author.name }} ({{ author.title}}, {{ author.org}})</li>
-      {% endfor %}
-    </ul>
-    {% else %}
-      {% assign alias = page.authors[0] %}
-      {% assign author = site.data.authors[alias] %}
-      <strong>Author:</strong> {{ author.name }} ({{ author.title}}, {{ author.org}})
-    {% endif %}
-{% unless page.nodate %}<br/><strong>Date:</strong> {{ page.date | date: "%b %-d, %Y" }}{% endunless %}
-{% if page.meta %}{{ page.meta }}{% endif %}</p>
-  </header>
-  <div class="addthis_sharing_toolbox"></div>
-
-  <article class="post-content">
-    {{ content }}
-  </article>
- <div id="disqus_thread"></div>
-    <script type="text/javascript">
-        /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-        var disqus_shortname = 'drill'; // required: replace example with your forum shortname
-
-        /* * * DON'T EDIT BELOW THIS LINE * * */
-        (function() {
-            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
-    </script>
-    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-    
-</div>
-<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-548b2caa33765e8d" async="async"></script>

http://git-wip-us.apache.org/repos/asf/drill/blob/81ee68a8/blog/_drafts/drill-0.9-released.md
----------------------------------------------------------------------
diff --git a/blog/_drafts/drill-0.9-released.md b/blog/_drafts/drill-0.9-released.md
new file mode 100644
index 0000000..5291f6a
--- /dev/null
+++ b/blog/_drafts/drill-0.9-released.md
@@ -0,0 +1,32 @@
+---
+layout: post
+title: "Drill 0.9 Released"
+code: drill-0.9-released
+excerpt: The community has just released Drill 0.9, which includes 199 resolved JIRAs and numerous enhancements.
+authors: ["tshiran", "jnadeau"]
+---
+It has been about a month since the release of Drill 0.8, which included [more than 240 improvements]({{ site.baseurl }}/blog/drill-0.8-released/). Today we're happy to announce the availability of Drill 0.9, providing additional enhancements and bug fixes. In fact, this release includes [199 resolved JIRAs](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12313820&version=12328813). Some of the noteworthy features in Drill 0.9 are:
+
+* **Authentication** ([DRILL-2674](https://issues.apache.org/jira/browse/DRILL-2674)). Drill now supports username/password authentication through the Java and C++ clients, as well as JDBC and ODBC. On the server-side, Drill leverages Linux PAM to securely validate the credentials. Users can choose to use an external user directory such as Active Directory or LDAP. To enable authentication, set the `security.user.auth` option in `drill-override.conf`.
+* **Impersonation** ([DRILL-2363](https://issues.apache.org/jira/browse/DRILL-2363)). Queries now execute and access resources using the identity of the user who submitted the query. Previously, all queries would run as the same user (eg, `drill`). With the new impersonation capability, the query will fail if the submitting user does not have permission to read the requested file(s) in the distributed file system. To enable impersonation, set the `drill.exec.impersonation` option in `drill-override.conf`.
+* **Ownership chaining**. Drill now allows views with different owners to be chained. This represents a very flexible access control solution. For example, an administrator with access to raw, sensitive data could create a view called `masked` which would expose only a subset of the data to other users. The administrator would enable users to read the `masked` view but not the raw data. Note that Drill provides an option `max_chained_user_hops` that specifies how many ownership changed are allowed in a chain, thereby providing administrators (or data stewards) more control over sharing of data.
+* **Extended JSON datatypes**. Our friends at MongoDB invented [extended JSON](http://docs.mongodb.org/manual/reference/mongodb-extended-json/) - a set of extensions to the JSON format for supporting additional data types. We decided to embrace extended JSON in Drill. For example, standard JSON doesn't have a time type, so a time could be represented as either a string or a number: `{"foo": "19:20:30.450Z"}` is just a string. With extended JSON, the `$time` qualifier can be used to specify that `foo` is a time `{"foo": {"$time": "19:20:30.450Z"}}`.
+  We now support a number of qualifiers including `$bin`, `$date`, `$time`, `$interval`, `$numberLong` and `$dateDay` (see [the example](https://github.com/apache/drill/blob/master/exec/java-exec/src/test/resources/vector/complex/extended.json)). We're in the process of adding some additional qualifiers to make sure that all of MongoDB's extended types are supported (this is particularly important when querying data in MongoDB).
+* **Avro support** ([DRILL-1512](https://issues.apache.org/jira/browse/DRILL-1512)). Drill can now read Avro files. This patch was contributed by Andrew Selden at Elastic.co (formerly known as Elasticsearch).
+* **Improved error messages** ([DRILL-2675](https://issues.apache.org/jira/browse/DRILL-2675) and more). It can be challenging for a complex distributed system like Drill to translate low-level internal conditions into actionable messages to the user. This release includes several enhancements that enable Drill to accomplish just that in a variety of cases.
+* **Parquet and Calcite enhancements** ([DRILL-1410](https://issues.apache.org/jira/browse/DRILL-1410) and [DRILL-1384](https://issues.apache.org/jira/browse/DRILL-1384)). Drill isn't a traditional query engine - it's the first analytical query engine with a JSON data model. This has required us to enhance Parquet (our columnar format) and Calcite (our SQL parser). These enhancements have now been contributed back to those projects, and Drill is using the latest versions which include these enhancements.
+* **New sys tables for memory and thread information** ([DRILL-2275](https://issues.apache.org/jira/browse/DRILL-2275)). Drill includes two new `sys` tables that provide real-time metrics about memory utilization and threads on each of the nodes in the cluster. You can run a simple `SELECT *` to see what information is available:
+
+    ```sql
+    SELECT * FROM sys.drillmemory;
+    SELECT * FROM sys.drillbitthreads;
+    ```
+
+* **Support for very wide tables** ([DRILL-2739](https://issues.apache.org/jira/browse/DRILL-2739)). Drill previously had some issues with tables that had more than 4095 colums. This limitation has been addressed.
+
+You can now [download Drill 0.9]({{ site.baseurl }}/download/). As always, you may check out the official [release notes](https://cwiki.apache.org/confluence/display/DRILL/Release+Notes) for more details.
+
+We're gearing up for Drill's 1.0 release later this month. Stay tuned!
+
+Happy Drilling!  
+Tomer Shiran and Jacques Nadeau
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/81ee68a8/blog/_posts/2015-04-30-apache-parquet-graudates-to-a-top-level-project.md
----------------------------------------------------------------------
diff --git a/blog/_posts/2015-04-30-apache-parquet-graudates-to-a-top-level-project.md b/blog/_posts/2015-04-30-apache-parquet-graudates-to-a-top-level-project.md
index 6fbc4a0..e8e0a56 100644
--- a/blog/_posts/2015-04-30-apache-parquet-graudates-to-a-top-level-project.md
+++ b/blog/_posts/2015-04-30-apache-parquet-graudates-to-a-top-level-project.md
@@ -5,13 +5,13 @@ code: apache-parquet-graudates-to-a-top-level-project
 excerpt: The Apache Parquet project has graduated to a top-level project (TLP) at the Apache Software Foundation.
 authors: ["tshiran"]
 ---
-It's an exciting day. Apache Parquet, the de-facto standard open source columnar format, has graduated to an Apache top-level project.
+It's an exciting day. Apache Parquet, the de-facto standard columnar format for Hadoop, has graduated to an Apache top-level project.
 
-The Drill project supports a variety of file formats, but Parquet is the highest performing format, and it's the one we recommend to anyone who wants to maximize the performance of their queries.
+The Drill project supports a variety of file formats, but Parquet is the highest performing format, and it's the one we recommend to anyone who wants to maximize the performance of their queries. We've had the pleasure of working closely with the Parquet community for over two years, and it's exciting to see how much the project has evolved.
 
-We've had the pleasure of working closely with the Parquet community for over a year, and it's exciting to see how much the project has evolved. We've made a number of contributions to the project, and we're gearing up for a major contribution after the Parquet 1.7 release.
+We've made a number of contributions to the project, including support for self-describing data. We just implemented off-heap memory management for the Parquet readers and writers, which will improve Parquet's memory handling. (This enhancement will be available in Parquet 1.8.)
 
-I wanted to congratulate Twitter's Julian Le Dem ([@j_](https://twitter.com/j_)), VP of Apache Parquet, and the entire Parquet community on the graduation milestone. Oh, and how can I get a two-letter Twitter handle?
+I wanted to congratulate Twitter's Julien Le Dem ([@j_](https://twitter.com/j_)), VP of Apache Parquet, and the entire Parquet community on the graduation milestone. Oh, and how can I get a two-letter Twitter handle?
 
-Happy Drilling!
-Tomer Shiran
+Happy Drilling!  
+Tomer Shiran
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/81ee68a8/blog/_posts/2015-05-04-drill-0.9-released.md
----------------------------------------------------------------------
diff --git a/blog/_posts/2015-05-04-drill-0.9-released.md b/blog/_posts/2015-05-04-drill-0.9-released.md
deleted file mode 100644
index 20e5ca4..0000000
--- a/blog/_posts/2015-05-04-drill-0.9-released.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-layout: post
-title: "Drill 0.9 Released"
-code: drill-0.9-released
-excerpt: The community has just released Drill 0.9, which includes 243 resolved JIRAs and numerous enhancements.
-authors: ["tshiran", "jnadeau"]
----
-It has been about a month since the release of Drill 0.8, which included [more than 240 improvements]({{ site.baseurl }}/blog/drill-0.8-released/). Today we're happy to announce the availability of Drill 0.9, providing additional enhancements and bug fixes. In fact, this release includes [199 resolved JIRAs](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12313820&version=12328813). Some of the noteworthy features in Drill 0.9 are:
-
-* **Authentication** ([DRILL-2674](https://issues.apache.org/jira/browse/DRILL-2674)). Drill now supports username/password authentication through the Java and C++ clients, as well as JDBC and ODBC. On the server-side, Drill leverages Linux PAM to securely validate the credentials. Users can choose to use an external user directory such as Active Directory or LDAP. To enable authentication, set the `security.user.auth` option in `drill-override.conf`.
-* **Impersonation** ([DRILL-2363](https://issues.apache.org/jira/browse/DRILL-2363)). Queries now execute and access resources using the identity of the user who submitted the query. Previously, all queries would run as the same user (eg, `drill`). With the new impersonation capability, the query will fail if the submitting user does not have permission to read the requested file(s) in the distributed file system. To enable impersonation, set the `drill.exec.impersonation` option in `drill-override.conf`.
-* **Ownership chaining**. Drill now allows views with different owners to be chained. This represents a very flexible access control solution. For example, an administrator with access to raw, sensitive data could create a view called `masked` which would expose only a subset of the data to other users. The administrator would enable users to read the `masked` view but not the raw data. Note that Drill provides an option `max_chained_user_hops` that specifies how many ownership changed are allowed in a chain, thereby providing administrators (or data stewards) more control over sharing of data.
-* **Extended JSON datatypes**. Our friends at MongoDB invented [extended JSON](http://docs.mongodb.org/manual/reference/mongodb-extended-json/) - a set of extensions to the JSON format for supporting additional data types. We decided to embrace extended JSON in Drill. For example, standard JSON doesn't have a time type, so a time could be represented as either a string or a number: `{"foo": "19:20:30.450Z"}` is just a string. With extended JSON, the `$time` qualifier can be used to specify that `foo` is a time `{"foo": {"$time": "19:20:30.450Z"}}`.
-  We now support a number of qualifiers including `$bin`, `$date`, `$time`, `$interval`, `$numberLong` and `$dateDay` (see [the example](https://github.com/apache/drill/blob/master/exec/java-exec/src/test/resources/vector/complex/extended.json)). We're in the process of adding some additional qualifiers to make sure that all of MongoDB's extended types are supported (this is particularly important when querying data in MongoDB).
-* **Improved error messages** ([DRILL-2675](https://issues.apache.org/jira/browse/DRILL-2675) and more). It can be challenging for a complex distributed system like Drill to translate low-level internal conditions into actionable messages to the user. This release includes several enhancements that enable Drill to accomplish just that in a variety of cases.
-* **Parquet and Calcite enhancements** ([DRILL-1410](https://issues.apache.org/jira/browse/DRILL-1410) and [DRILL-1384](https://issues.apache.org/jira/browse/DRILL-1384)). Drill isn't a traditional query engine - it's the first analytical query engine with a JSON data model. This has required us to enhance Parquet (our columnar format) and Calcite (our SQL parser). These enhancements have now been contributed back to those projects, and Drill is using the latest versions which include these enhancements.
-* **Avro support** ([DRILL-1512](https://issues.apache.org/jira/browse/DRILL-1512)). Drill can now read Avro files. This patch was contributed by Andrew Selden at Elastic.co (formerly known as Elasticsearch).
-* **New sys tables for memory and thread information** ([DRILL-2275](https://issues.apache.org/jira/browse/DRILL-2275)). Drill includes two new `sys` tables that provide real-time metrics about memory utilization and threads on each of the nodes in the cluster. You can run a simple `SELECT *` to see what information is available:
-
-    ```sql
-    SELECT * FROM sys.drillmemory;
-    SELECT * FROM sys.drillbitthreads;
-    ```
-
-* **Support for very wide tables** ([DRILL-2739](https://issues.apache.org/jira/browse/DRILL-2739)). Drill previously had some issues with tables that had more than 4095 colums. This limitation has been addressed.
-
-You can now [download Drill 0.9]({{ site.baseurl }}/download/). As always, you may check out the official [release notes](https://cwiki.apache.org/confluence/display/DRILL/Release+Notes) for more details.
-
-We're gearing up for Drill's 1.0 release later this month. Stay tuned!
-
-Happy Drilling!  
-Tomer Shiran and Jacques Nadeau
\ No newline at end of file


[50/50] [abbrv] drill git commit: minor edit

Posted by ts...@apache.org.
minor edit


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

Branch: refs/heads/gh-pages
Commit: 6ed707ba14a37d36976eba2522976157e52bace0
Parents: 2a81f84
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 11:01:30 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 11:01:30 2015 -0700

----------------------------------------------------------------------
 _docs/manage-drill/017-configuring-a-shared-drillbit.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/6ed707ba/_docs/manage-drill/017-configuring-a-shared-drillbit.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/017-configuring-a-shared-drillbit.md b/_docs/manage-drill/017-configuring-a-shared-drillbit.md
index ae9a8c7..f28194a 100644
--- a/_docs/manage-drill/017-configuring-a-shared-drillbit.md
+++ b/_docs/manage-drill/017-configuring-a-shared-drillbit.md
@@ -2,7 +2,7 @@
 title: "Configuring Resources for a Shared Drillbit"
 parent: "Configuring Different Workloads"
 ---
-To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization in addition to memory.
+To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization in addition to memory, as described in the previous section.
 
 ##Configuring Drill Query Queuing
 


[29/50] [abbrv] drill git commit: into to config options edits

Posted by ts...@apache.org.
into to config options edits


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

Branch: refs/heads/gh-pages
Commit: 9109d7a05730a76746fe14f21a7c3193108cdb3e
Parents: ca09bb3
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 10:06:25 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 10:06:25 2015 -0700

----------------------------------------------------------------------
 .../010-configuration-options-introduction.md                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/9109d7a0/_docs/manage-drill/configuration-options/010-configuration-options-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/configuration-options/010-configuration-options-introduction.md b/_docs/manage-drill/configuration-options/010-configuration-options-introduction.md
index 65f646d..ab5370b 100644
--- a/_docs/manage-drill/configuration-options/010-configuration-options-introduction.md
+++ b/_docs/manage-drill/configuration-options/010-configuration-options-introduction.md
@@ -9,9 +9,10 @@ env.sh` and `drill-override.conf` files. Drill stores these files in the
 `/conf` directory. Drill sources` /etc/drill/conf` if it exists. Otherwise,
 Drill sources the local `<drill_installation_directory>/conf` directory.
 
-The sys.options table in Drill contains information about boot and system options listed in the following tables. To tune performance, you adjust some of the options to suit your application. Configure the options using the ALTER SESSION or ALTER SYSTEM command.
+The sys.options table in Drill contains information about boot (start-up) and system options listed in the tables on this page. 
 
 ## Boot Options
+The section, ["Start-up Options"]({{site.baseurl}}/docs/start-up-options), covers how to configure and view these options. 
 
 <table>
   <tr>
@@ -132,6 +133,7 @@ The sys.options table in Drill contains information about boot and system option
 </table>
 
 ## System Options
+The sys.options table lists the following options that you can set at the session or system level as described in the section, ["Planning and Execution Options"]({{site.baseurl}}/docs/planning-and-execution-options) 
 
 <table>
   <tr>


[02/50] [abbrv] drill git commit: Blog post update

Posted by ts...@apache.org.
Blog post update


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

Branch: refs/heads/gh-pages
Commit: 12c8c2f7ee54b79c6b6687793890e003daae4816
Parents: 4ea5e80
Author: Tomer Shiran <ts...@gmail.com>
Authored: Wed Apr 29 14:37:30 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Wed Apr 29 14:37:30 2015 -0700

----------------------------------------------------------------------
 blog/_posts/2015-05-04-drill-0.9-released.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/12c8c2f7/blog/_posts/2015-05-04-drill-0.9-released.md
----------------------------------------------------------------------
diff --git a/blog/_posts/2015-05-04-drill-0.9-released.md b/blog/_posts/2015-05-04-drill-0.9-released.md
index 23c868a..20e5ca4 100644
--- a/blog/_posts/2015-05-04-drill-0.9-released.md
+++ b/blog/_posts/2015-05-04-drill-0.9-released.md
@@ -7,10 +7,13 @@ authors: ["tshiran", "jnadeau"]
 ---
 It has been about a month since the release of Drill 0.8, which included [more than 240 improvements]({{ site.baseurl }}/blog/drill-0.8-released/). Today we're happy to announce the availability of Drill 0.9, providing additional enhancements and bug fixes. In fact, this release includes [199 resolved JIRAs](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12313820&version=12328813). Some of the noteworthy features in Drill 0.9 are:
 
-* **Authentication** ([DRILL-2674](https://issues.apache.org/jira/browse/DRILL-2674)). Drill now supports username/password authentication through the Java and C++ clients, as well as JDBC and ODBC. On the server-side, Drill leverages Linux PAM to securely validate the credentials. Users can choose to use an external user directory such as Active Directory or LDAP. To enable authentication, set the `security.user.auth` option in `drill-override.conf`. 
+* **Authentication** ([DRILL-2674](https://issues.apache.org/jira/browse/DRILL-2674)). Drill now supports username/password authentication through the Java and C++ clients, as well as JDBC and ODBC. On the server-side, Drill leverages Linux PAM to securely validate the credentials. Users can choose to use an external user directory such as Active Directory or LDAP. To enable authentication, set the `security.user.auth` option in `drill-override.conf`.
 * **Impersonation** ([DRILL-2363](https://issues.apache.org/jira/browse/DRILL-2363)). Queries now execute and access resources using the identity of the user who submitted the query. Previously, all queries would run as the same user (eg, `drill`). With the new impersonation capability, the query will fail if the submitting user does not have permission to read the requested file(s) in the distributed file system. To enable impersonation, set the `drill.exec.impersonation` option in `drill-override.conf`.
+* **Ownership chaining**. Drill now allows views with different owners to be chained. This represents a very flexible access control solution. For example, an administrator with access to raw, sensitive data could create a view called `masked` which would expose only a subset of the data to other users. The administrator would enable users to read the `masked` view but not the raw data. Note that Drill provides an option `max_chained_user_hops` that specifies how many ownership changed are allowed in a chain, thereby providing administrators (or data stewards) more control over sharing of data.
+* **Extended JSON datatypes**. Our friends at MongoDB invented [extended JSON](http://docs.mongodb.org/manual/reference/mongodb-extended-json/) - a set of extensions to the JSON format for supporting additional data types. We decided to embrace extended JSON in Drill. For example, standard JSON doesn't have a time type, so a time could be represented as either a string or a number: `{"foo": "19:20:30.450Z"}` is just a string. With extended JSON, the `$time` qualifier can be used to specify that `foo` is a time `{"foo": {"$time": "19:20:30.450Z"}}`.
+  We now support a number of qualifiers including `$bin`, `$date`, `$time`, `$interval`, `$numberLong` and `$dateDay` (see [the example](https://github.com/apache/drill/blob/master/exec/java-exec/src/test/resources/vector/complex/extended.json)). We're in the process of adding some additional qualifiers to make sure that all of MongoDB's extended types are supported (this is particularly important when querying data in MongoDB).
 * **Improved error messages** ([DRILL-2675](https://issues.apache.org/jira/browse/DRILL-2675) and more). It can be challenging for a complex distributed system like Drill to translate low-level internal conditions into actionable messages to the user. This release includes several enhancements that enable Drill to accomplish just that in a variety of cases.
-* **Parquet and Calcite enhancements** ([DRILL-1410](https://issues.apache.org/jira/browse/DRILL-1410) and [DRILL-1384](https://issues.apache.org/jira/browse/DRILL-1384)). Drill isn't a traditional query engine. It's the first analytical query engine with a JSON data model. It utilizes a shredded, columnar, in-memory representation of complex data, and automatically compiles and re-compiles queries on-the-fly during execution based on the actual data (we sometimes call this 'schema discovery on-the-fly'). These unique capabilities have required us to enhance Parquet (our columnar format) and Calcite (our SQL parser). These enhancements have now been contributed back to those projects, and Drill is using the latest versions which include these enhancements.
+* **Parquet and Calcite enhancements** ([DRILL-1410](https://issues.apache.org/jira/browse/DRILL-1410) and [DRILL-1384](https://issues.apache.org/jira/browse/DRILL-1384)). Drill isn't a traditional query engine - it's the first analytical query engine with a JSON data model. This has required us to enhance Parquet (our columnar format) and Calcite (our SQL parser). These enhancements have now been contributed back to those projects, and Drill is using the latest versions which include these enhancements.
 * **Avro support** ([DRILL-1512](https://issues.apache.org/jira/browse/DRILL-1512)). Drill can now read Avro files. This patch was contributed by Andrew Selden at Elastic.co (formerly known as Elasticsearch).
 * **New sys tables for memory and thread information** ([DRILL-2275](https://issues.apache.org/jira/browse/DRILL-2275)). Drill includes two new `sys` tables that provide real-time metrics about memory utilization and threads on each of the nodes in the cluster. You can run a simple `SELECT *` to see what information is available:
 


[40/50] [abbrv] drill git commit: commands reorg

Posted by ts...@apache.org.
http://git-wip-us.apache.org/repos/asf/drill/blob/76352670/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index d016d92..4efa490 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -20,8 +20,8 @@
         "ALTER SESSION Command": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -31,18 +31,18 @@
             "children": [], 
             "next_title": "ALTER SYSTEM Command", 
             "next_url": "/docs/alter-system-command/", 
-            "parent": "SQL Commands Summary", 
+            "parent": "SQL Commands", 
             "previous_title": "Supported SQL Commands", 
             "previous_url": "/docs/supported-sql-commands/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/010-alter-session-command.md", 
+            "relative_path": "_docs/sql-reference/sql-commands/010-alter-session-command.md", 
             "title": "ALTER SESSION Command", 
             "url": "/docs/alter-session-command/"
         }, 
         "ALTER SYSTEM Command": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -52,10 +52,10 @@
             "children": [], 
             "next_title": "CREATE TABLE AS (CTAS) command", 
             "next_url": "/docs/create-table-as-ctas-command/", 
-            "parent": "SQL Commands Summary", 
+            "parent": "SQL Commands", 
             "previous_title": "ALTER SESSION Command", 
             "previous_url": "/docs/alter-session-command/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/020-alter-system.md", 
+            "relative_path": "_docs/sql-reference/sql-commands/020-alter-system.md", 
             "title": "ALTER SYSTEM Command", 
             "url": "/docs/alter-system-command/"
         }, 
@@ -610,8 +610,8 @@
         "CREATE TABLE AS (CTAS) command": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -621,18 +621,18 @@
             "children": [], 
             "next_title": "CREATE VIEW command", 
             "next_url": "/docs/create-view-command/", 
-            "parent": "SQL Commands Summary", 
+            "parent": "SQL Commands", 
             "previous_title": "ALTER SYSTEM Command", 
             "previous_url": "/docs/alter-system-command/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/030-create-table-as-command.md", 
+            "relative_path": "_docs/sql-reference/sql-commands/030-create-table-as-command.md", 
             "title": "CREATE TABLE AS (CTAS) command", 
             "url": "/docs/create-table-as-ctas-command/"
         }, 
         "CREATE VIEW command": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -642,10 +642,10 @@
             "children": [], 
             "next_title": "DESCRIBE Command", 
             "next_url": "/docs/describe-command/", 
-            "parent": "SQL Commands Summary", 
+            "parent": "SQL Commands", 
             "previous_title": "CREATE TABLE AS (CTAS) command", 
             "previous_url": "/docs/create-table-as-ctas-command/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/050-create-view-command.md", 
+            "relative_path": "_docs/sql-reference/sql-commands/050-create-view-command.md", 
             "title": "CREATE VIEW command", 
             "url": "/docs/create-view-command/"
         }, 
@@ -690,8 +690,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring a Cluster for Different Workloads", 
-                    "next_url": "/docs/configuring-a-cluster-for-different-workloads/", 
+                    "next_title": "Start-Up Options", 
+                    "next_url": "/docs/start-up-options/", 
                     "parent": "Configuration Options", 
                     "previous_title": "Configuration Options", 
                     "previous_url": "/docs/configuration-options/", 
@@ -711,32 +711,11 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Start-Up Options", 
-                    "next_url": "/docs/start-up-options/", 
-                    "parent": "Configuration Options", 
-                    "previous_title": "Configuration Options Introduction", 
-                    "previous_url": "/docs/configuration-options-introduction/", 
-                    "relative_path": "_docs/manage-drill/configuration-options/015-configuring-a-cluster-for-different-workloads.md", 
-                    "title": "Configuring a Cluster for Different Workloads", 
-                    "url": "/docs/configuring-a-cluster-for-different-workloads/"
-                }, 
-                {
-                    "breadcrumbs": [
-                        {
-                            "title": "Configuration Options", 
-                            "url": "/docs/configuration-options/"
-                        }, 
-                        {
-                            "title": "Manage Drill", 
-                            "url": "/docs/manage-drill/"
-                        }
-                    ], 
-                    "children": [], 
                     "next_title": "Planning and Execution Options", 
                     "next_url": "/docs/planning-and-execution-options/", 
                     "parent": "Configuration Options", 
-                    "previous_title": "Configuring a Cluster for Different Workloads", 
-                    "previous_url": "/docs/configuring-a-cluster-for-different-workloads/", 
+                    "previous_title": "Configuration Options Introduction", 
+                    "previous_url": "/docs/configuration-options-introduction/", 
                     "relative_path": "_docs/manage-drill/configuration-options/020-start-up-options.md", 
                     "title": "Start-Up Options", 
                     "url": "/docs/start-up-options/"
@@ -787,8 +766,8 @@
             "next_title": "Configuration Options Introduction", 
             "next_url": "/docs/configuration-options-introduction/", 
             "parent": "Manage Drill", 
-            "previous_title": "How Multiple Users Share a Drillbit", 
-            "previous_url": "/docs/how-multiple-users-share-a-drillbit/", 
+            "previous_title": "Configuring a Shared Drillbit", 
+            "previous_url": "/docs/configuring-a-shared-drillbit/", 
             "relative_path": "_docs/manage-drill/020-configuration-options.md", 
             "title": "Configuration Options", 
             "url": "/docs/configuration-options/"
@@ -805,8 +784,8 @@
                 }
             ], 
             "children": [], 
-            "next_title": "Configuring a Cluster for Different Workloads", 
-            "next_url": "/docs/configuring-a-cluster-for-different-workloads/", 
+            "next_title": "Start-Up Options", 
+            "next_url": "/docs/start-up-options/", 
             "parent": "Configuration Options", 
             "previous_title": "Configuration Options", 
             "previous_url": "/docs/configuration-options/", 
@@ -856,28 +835,151 @@
             "title": "Configuring Connections on Windows", 
             "url": "/docs/configuring-connections-on-windows/"
         }, 
-        "Configuring Memory": {
+        "Configuring Different Workloads": {
             "breadcrumbs": [
                 {
                     "title": "Manage Drill", 
                     "url": "/docs/manage-drill/"
                 }
             ], 
+            "children": [
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Configuring Different Workloads", 
+                            "url": "/docs/configuring-different-workloads/"
+                        }, 
+                        {
+                            "title": "Manage Drill", 
+                            "url": "/docs/manage-drill/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "Configuring Drill in a Cluster", 
+                    "next_url": "/docs/configuring-drill-in-a-cluster/", 
+                    "parent": "Configuring Different Workloads", 
+                    "previous_title": "Configuring Different Workloads", 
+                    "previous_url": "/docs/configuring-different-workloads/", 
+                    "relative_path": "_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md", 
+                    "title": "Configuring Different Workloads Introduction", 
+                    "url": "/docs/configuring-different-workloads-introduction/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Configuring Different Workloads", 
+                            "url": "/docs/configuring-different-workloads/"
+                        }, 
+                        {
+                            "title": "Manage Drill", 
+                            "url": "/docs/manage-drill/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "Configuring a Shared Drillbit", 
+                    "next_url": "/docs/configuring-a-shared-drillbit/", 
+                    "parent": "Configuring Different Workloads", 
+                    "previous_title": "Configuring Different Workloads Introduction", 
+                    "previous_url": "/docs/configuring-different-workloads-introduction/", 
+                    "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md", 
+                    "title": "Configuring Drill in a Cluster", 
+                    "url": "/docs/configuring-drill-in-a-cluster/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Configuring Different Workloads", 
+                            "url": "/docs/configuring-different-workloads/"
+                        }, 
+                        {
+                            "title": "Manage Drill", 
+                            "url": "/docs/manage-drill/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "Configuration Options", 
+                    "next_url": "/docs/configuration-options/", 
+                    "parent": "Configuring Different Workloads", 
+                    "previous_title": "Configuring Drill in a Cluster", 
+                    "previous_url": "/docs/configuring-drill-in-a-cluster/", 
+                    "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
+                    "title": "Configuring a Shared Drillbit", 
+                    "url": "/docs/configuring-a-shared-drillbit/"
+                }
+            ], 
+            "next_title": "Configuring Different Workloads Introduction", 
+            "next_url": "/docs/configuring-different-workloads-introduction/", 
+            "parent": "Manage Drill", 
+            "previous_title": "Configuring Memory for Drill", 
+            "previous_url": "/docs/configuring-memory-for-drill/", 
+            "relative_path": "_docs/manage-drill/012-configuring-different-workloads.md", 
+            "title": "Configuring Different Workloads", 
+            "url": "/docs/configuring-different-workloads/"
+        }, 
+        "Configuring Different Workloads Introduction": {
+            "breadcrumbs": [
+                {
+                    "title": "Configuring Different Workloads", 
+                    "url": "/docs/configuring-different-workloads/"
+                }, 
+                {
+                    "title": "Manage Drill", 
+                    "url": "/docs/manage-drill/"
+                }
+            ], 
+            "children": [], 
+            "next_title": "Configuring Drill in a Cluster", 
+            "next_url": "/docs/configuring-drill-in-a-cluster/", 
+            "parent": "Configuring Different Workloads", 
+            "previous_title": "Configuring Different Workloads", 
+            "previous_url": "/docs/configuring-different-workloads/", 
+            "relative_path": "_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md", 
+            "title": "Configuring Different Workloads Introduction", 
+            "url": "/docs/configuring-different-workloads-introduction/"
+        }, 
+        "Configuring Drill in a Cluster": {
+            "breadcrumbs": [
+                {
+                    "title": "Configuring Different Workloads", 
+                    "url": "/docs/configuring-different-workloads/"
+                }, 
+                {
+                    "title": "Manage Drill", 
+                    "url": "/docs/manage-drill/"
+                }
+            ], 
             "children": [], 
-            "next_title": "Multitenant and Multi-instance Architectures", 
-            "next_url": "/docs/multitenant-and-multi-instance-architectures/", 
+            "next_title": "Configuring a Shared Drillbit", 
+            "next_url": "/docs/configuring-a-shared-drillbit/", 
+            "parent": "Configuring Different Workloads", 
+            "previous_title": "Configuring Different Workloads Introduction", 
+            "previous_url": "/docs/configuring-different-workloads-introduction/", 
+            "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md", 
+            "title": "Configuring Drill in a Cluster", 
+            "url": "/docs/configuring-drill-in-a-cluster/"
+        }, 
+        "Configuring Memory for Drill": {
+            "breadcrumbs": [
+                {
+                    "title": "Manage Drill", 
+                    "url": "/docs/manage-drill/"
+                }
+            ], 
+            "children": [], 
+            "next_title": "Configuring Different Workloads", 
+            "next_url": "/docs/configuring-different-workloads/", 
             "parent": "Manage Drill", 
             "previous_title": "Manage Drill Introduction", 
             "previous_url": "/docs/manage-drill-introduction/", 
             "relative_path": "_docs/manage-drill/011-configuring-memory.md", 
-            "title": "Configuring Memory", 
-            "url": "/docs/configuring-memory/"
+            "title": "Configuring Memory for Drill", 
+            "url": "/docs/configuring-memory-for-drill/"
         }, 
-        "Configuring a Cluster for Different Workloads": {
+        "Configuring a Shared Drillbit": {
             "breadcrumbs": [
                 {
-                    "title": "Configuration Options", 
-                    "url": "/docs/configuration-options/"
+                    "title": "Configuring Different Workloads", 
+                    "url": "/docs/configuring-different-workloads/"
                 }, 
                 {
                     "title": "Manage Drill", 
@@ -885,14 +987,14 @@
                 }
             ], 
             "children": [], 
-            "next_title": "Start-Up Options", 
-            "next_url": "/docs/start-up-options/", 
-            "parent": "Configuration Options", 
-            "previous_title": "Configuration Options Introduction", 
-            "previous_url": "/docs/configuration-options-introduction/", 
-            "relative_path": "_docs/manage-drill/configuration-options/015-configuring-a-cluster-for-different-workloads.md", 
-            "title": "Configuring a Cluster for Different Workloads", 
-            "url": "/docs/configuring-a-cluster-for-different-workloads/"
+            "next_title": "Configuration Options", 
+            "next_url": "/docs/configuration-options/", 
+            "parent": "Configuring Different Workloads", 
+            "previous_title": "Configuring Drill in a Cluster", 
+            "previous_url": "/docs/configuring-drill-in-a-cluster/", 
+            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
+            "title": "Configuring a Shared Drillbit", 
+            "url": "/docs/configuring-a-shared-drillbit/"
         }, 
         "Connect a Data Source": {
             "breadcrumbs": [], 
@@ -1254,8 +1356,8 @@
         "DESCRIBE Command": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -1265,10 +1367,10 @@
             "children": [], 
             "next_title": "EXPLAIN commands", 
             "next_url": "/docs/explain-commands/", 
-            "parent": "SQL Commands Summary", 
+            "parent": "SQL Commands", 
             "previous_title": "CREATE VIEW command", 
             "previous_url": "/docs/create-view-command/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/060-describe-command.md", 
+            "relative_path": "_docs/sql-reference/sql-commands/060-describe-command.md", 
             "title": "DESCRIBE Command", 
             "url": "/docs/describe-command/"
         }, 
@@ -2291,8 +2393,8 @@
         "EXPLAIN commands": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -2302,10 +2404,10 @@
             "children": [], 
             "next_title": "SELECT Statements", 
             "next_url": "/docs/select-statements/", 
-            "parent": "SQL Commands Summary", 
+            "parent": "SQL Commands", 
             "previous_title": "DESCRIBE Command", 
             "previous_url": "/docs/describe-command/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/070-explain-commands.md", 
+            "relative_path": "_docs/sql-reference/sql-commands/070-explain-commands.md", 
             "title": "EXPLAIN commands", 
             "url": "/docs/explain-commands/"
         }, 
@@ -2579,48 +2681,6 @@
             "title": "Hive-to-Drill Data Type Mapping", 
             "url": "/docs/hive-to-drill-data-type-mapping/"
         }, 
-        "How Multiple Users Share a Drillbit": {
-            "breadcrumbs": [
-                {
-                    "title": "Multitenant and Multi-instance Architectures", 
-                    "url": "/docs/multitenant-and-multi-instance-architectures/"
-                }, 
-                {
-                    "title": "Manage Drill", 
-                    "url": "/docs/manage-drill/"
-                }
-            ], 
-            "children": [], 
-            "next_title": "Configuration Options", 
-            "next_url": "/docs/configuration-options/", 
-            "parent": "Multitenant and Multi-instance Architectures", 
-            "previous_title": "How to Run Drill in a Cluster", 
-            "previous_url": "/docs/how-to-run-drill-in-a-cluster/", 
-            "relative_path": "_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md", 
-            "title": "How Multiple Users Share a Drillbit", 
-            "url": "/docs/how-multiple-users-share-a-drillbit/"
-        }, 
-        "How to Run Drill in a Cluster": {
-            "breadcrumbs": [
-                {
-                    "title": "Multitenant and Multi-instance Architectures", 
-                    "url": "/docs/multitenant-and-multi-instance-architectures/"
-                }, 
-                {
-                    "title": "Manage Drill", 
-                    "url": "/docs/manage-drill/"
-                }
-            ], 
-            "children": [], 
-            "next_title": "How Multiple Users Share a Drillbit", 
-            "next_url": "/docs/how-multiple-users-share-a-drillbit/", 
-            "parent": "Multitenant and Multi-instance Architectures", 
-            "previous_title": "Multitenant and Multi-instance Architectures Introduction", 
-            "previous_url": "/docs/multitenant-and-multi-instance-architectures-introduction/", 
-            "relative_path": "_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md", 
-            "title": "How to Run Drill in a Cluster", 
-            "url": "/docs/how-to-run-drill-in-a-cluster/"
-        }, 
         "How to Run the Drill Demo": {
             "breadcrumbs": [
                 {
@@ -3398,8 +3458,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring Memory", 
-                    "next_url": "/docs/configuring-memory/", 
+                    "next_title": "Configuring Memory for Drill", 
+                    "next_url": "/docs/configuring-memory-for-drill/", 
                     "parent": "Manage Drill", 
                     "previous_title": "Manage Drill", 
                     "previous_url": "/docs/manage-drill/", 
@@ -3415,14 +3475,14 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Multitenant and Multi-instance Architectures", 
-                    "next_url": "/docs/multitenant-and-multi-instance-architectures/", 
+                    "next_title": "Configuring Different Workloads", 
+                    "next_url": "/docs/configuring-different-workloads/", 
                     "parent": "Manage Drill", 
                     "previous_title": "Manage Drill Introduction", 
                     "previous_url": "/docs/manage-drill-introduction/", 
                     "relative_path": "_docs/manage-drill/011-configuring-memory.md", 
-                    "title": "Configuring Memory", 
-                    "url": "/docs/configuring-memory/"
+                    "title": "Configuring Memory for Drill", 
+                    "url": "/docs/configuring-memory-for-drill/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -3435,8 +3495,8 @@
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "Multitenant and Multi-instance Architectures", 
-                                    "url": "/docs/multitenant-and-multi-instance-architectures/"
+                                    "title": "Configuring Different Workloads", 
+                                    "url": "/docs/configuring-different-workloads/"
                                 }, 
                                 {
                                     "title": "Manage Drill", 
@@ -3444,20 +3504,20 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "How to Run Drill in a Cluster", 
-                            "next_url": "/docs/how-to-run-drill-in-a-cluster/", 
-                            "parent": "Multitenant and Multi-instance Architectures", 
-                            "previous_title": "Multitenant and Multi-instance Architectures", 
-                            "previous_url": "/docs/multitenant-and-multi-instance-architectures/", 
-                            "relative_path": "_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md", 
-                            "title": "Multitenant and Multi-instance Architectures Introduction", 
-                            "url": "/docs/multitenant-and-multi-instance-architectures-introduction/"
+                            "next_title": "Configuring Drill in a Cluster", 
+                            "next_url": "/docs/configuring-drill-in-a-cluster/", 
+                            "parent": "Configuring Different Workloads", 
+                            "previous_title": "Configuring Different Workloads", 
+                            "previous_url": "/docs/configuring-different-workloads/", 
+                            "relative_path": "_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md", 
+                            "title": "Configuring Different Workloads Introduction", 
+                            "url": "/docs/configuring-different-workloads-introduction/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "Multitenant and Multi-instance Architectures", 
-                                    "url": "/docs/multitenant-and-multi-instance-architectures/"
+                                    "title": "Configuring Different Workloads", 
+                                    "url": "/docs/configuring-different-workloads/"
                                 }, 
                                 {
                                     "title": "Manage Drill", 
@@ -3465,20 +3525,20 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "How Multiple Users Share a Drillbit", 
-                            "next_url": "/docs/how-multiple-users-share-a-drillbit/", 
-                            "parent": "Multitenant and Multi-instance Architectures", 
-                            "previous_title": "Multitenant and Multi-instance Architectures Introduction", 
-                            "previous_url": "/docs/multitenant-and-multi-instance-architectures-introduction/", 
-                            "relative_path": "_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md", 
-                            "title": "How to Run Drill in a Cluster", 
-                            "url": "/docs/how-to-run-drill-in-a-cluster/"
+                            "next_title": "Configuring a Shared Drillbit", 
+                            "next_url": "/docs/configuring-a-shared-drillbit/", 
+                            "parent": "Configuring Different Workloads", 
+                            "previous_title": "Configuring Different Workloads Introduction", 
+                            "previous_url": "/docs/configuring-different-workloads-introduction/", 
+                            "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md", 
+                            "title": "Configuring Drill in a Cluster", 
+                            "url": "/docs/configuring-drill-in-a-cluster/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "Multitenant and Multi-instance Architectures", 
-                                    "url": "/docs/multitenant-and-multi-instance-architectures/"
+                                    "title": "Configuring Different Workloads", 
+                                    "url": "/docs/configuring-different-workloads/"
                                 }, 
                                 {
                                     "title": "Manage Drill", 
@@ -3488,22 +3548,22 @@
                             "children": [], 
                             "next_title": "Configuration Options", 
                             "next_url": "/docs/configuration-options/", 
-                            "parent": "Multitenant and Multi-instance Architectures", 
-                            "previous_title": "How to Run Drill in a Cluster", 
-                            "previous_url": "/docs/how-to-run-drill-in-a-cluster/", 
-                            "relative_path": "_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md", 
-                            "title": "How Multiple Users Share a Drillbit", 
-                            "url": "/docs/how-multiple-users-share-a-drillbit/"
+                            "parent": "Configuring Different Workloads", 
+                            "previous_title": "Configuring Drill in a Cluster", 
+                            "previous_url": "/docs/configuring-drill-in-a-cluster/", 
+                            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
+                            "title": "Configuring a Shared Drillbit", 
+                            "url": "/docs/configuring-a-shared-drillbit/"
                         }
                     ], 
-                    "next_title": "Multitenant and Multi-instance Architectures Introduction", 
-                    "next_url": "/docs/multitenant-and-multi-instance-architectures-introduction/", 
+                    "next_title": "Configuring Different Workloads Introduction", 
+                    "next_url": "/docs/configuring-different-workloads-introduction/", 
                     "parent": "Manage Drill", 
-                    "previous_title": "Configuring Memory", 
-                    "previous_url": "/docs/configuring-memory/", 
-                    "relative_path": "_docs/manage-drill/012-multitenant-and-multi-instance-architectures.md", 
-                    "title": "Multitenant and Multi-instance Architectures", 
-                    "url": "/docs/multitenant-and-multi-instance-architectures/"
+                    "previous_title": "Configuring Memory for Drill", 
+                    "previous_url": "/docs/configuring-memory-for-drill/", 
+                    "relative_path": "_docs/manage-drill/012-configuring-different-workloads.md", 
+                    "title": "Configuring Different Workloads", 
+                    "url": "/docs/configuring-different-workloads/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -3525,8 +3585,8 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring a Cluster for Different Workloads", 
-                            "next_url": "/docs/configuring-a-cluster-for-different-workloads/", 
+                            "next_title": "Start-Up Options", 
+                            "next_url": "/docs/start-up-options/", 
                             "parent": "Configuration Options", 
                             "previous_title": "Configuration Options", 
                             "previous_url": "/docs/configuration-options/", 
@@ -3546,32 +3606,11 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Start-Up Options", 
-                            "next_url": "/docs/start-up-options/", 
-                            "parent": "Configuration Options", 
-                            "previous_title": "Configuration Options Introduction", 
-                            "previous_url": "/docs/configuration-options-introduction/", 
-                            "relative_path": "_docs/manage-drill/configuration-options/015-configuring-a-cluster-for-different-workloads.md", 
-                            "title": "Configuring a Cluster for Different Workloads", 
-                            "url": "/docs/configuring-a-cluster-for-different-workloads/"
-                        }, 
-                        {
-                            "breadcrumbs": [
-                                {
-                                    "title": "Configuration Options", 
-                                    "url": "/docs/configuration-options/"
-                                }, 
-                                {
-                                    "title": "Manage Drill", 
-                                    "url": "/docs/manage-drill/"
-                                }
-                            ], 
-                            "children": [], 
                             "next_title": "Planning and Execution Options", 
                             "next_url": "/docs/planning-and-execution-options/", 
                             "parent": "Configuration Options", 
-                            "previous_title": "Configuring a Cluster for Different Workloads", 
-                            "previous_url": "/docs/configuring-a-cluster-for-different-workloads/", 
+                            "previous_title": "Configuration Options Introduction", 
+                            "previous_url": "/docs/configuration-options-introduction/", 
                             "relative_path": "_docs/manage-drill/configuration-options/020-start-up-options.md", 
                             "title": "Start-Up Options", 
                             "url": "/docs/start-up-options/"
@@ -3622,8 +3661,8 @@
                     "next_title": "Configuration Options Introduction", 
                     "next_url": "/docs/configuration-options-introduction/", 
                     "parent": "Manage Drill", 
-                    "previous_title": "How Multiple Users Share a Drillbit", 
-                    "previous_url": "/docs/how-multiple-users-share-a-drillbit/", 
+                    "previous_title": "Configuring a Shared Drillbit", 
+                    "previous_url": "/docs/configuring-a-shared-drillbit/", 
                     "relative_path": "_docs/manage-drill/020-configuration-options.md", 
                     "title": "Configuration Options", 
                     "url": "/docs/configuration-options/"
@@ -3714,8 +3753,8 @@
                 }
             ], 
             "children": [], 
-            "next_title": "Configuring Memory", 
-            "next_url": "/docs/configuring-memory/", 
+            "next_title": "Configuring Memory for Drill", 
+            "next_url": "/docs/configuring-memory-for-drill/", 
             "parent": "Manage Drill", 
             "previous_title": "Manage Drill", 
             "previous_url": "/docs/manage-drill/", 
@@ -3795,108 +3834,6 @@
             "title": "Monitoring and Canceling Queries in the Drill Web UI", 
             "url": "/docs/monitoring-and-canceling-queries-in-the-drill-web-ui/"
         }, 
-        "Multitenant and Multi-instance Architectures": {
-            "breadcrumbs": [
-                {
-                    "title": "Manage Drill", 
-                    "url": "/docs/manage-drill/"
-                }
-            ], 
-            "children": [
-                {
-                    "breadcrumbs": [
-                        {
-                            "title": "Multitenant and Multi-instance Architectures", 
-                            "url": "/docs/multitenant-and-multi-instance-architectures/"
-                        }, 
-                        {
-                            "title": "Manage Drill", 
-                            "url": "/docs/manage-drill/"
-                        }
-                    ], 
-                    "children": [], 
-                    "next_title": "How to Run Drill in a Cluster", 
-                    "next_url": "/docs/how-to-run-drill-in-a-cluster/", 
-                    "parent": "Multitenant and Multi-instance Architectures", 
-                    "previous_title": "Multitenant and Multi-instance Architectures", 
-                    "previous_url": "/docs/multitenant-and-multi-instance-architectures/", 
-                    "relative_path": "_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md", 
-                    "title": "Multitenant and Multi-instance Architectures Introduction", 
-                    "url": "/docs/multitenant-and-multi-instance-architectures-introduction/"
-                }, 
-                {
-                    "breadcrumbs": [
-                        {
-                            "title": "Multitenant and Multi-instance Architectures", 
-                            "url": "/docs/multitenant-and-multi-instance-architectures/"
-                        }, 
-                        {
-                            "title": "Manage Drill", 
-                            "url": "/docs/manage-drill/"
-                        }
-                    ], 
-                    "children": [], 
-                    "next_title": "How Multiple Users Share a Drillbit", 
-                    "next_url": "/docs/how-multiple-users-share-a-drillbit/", 
-                    "parent": "Multitenant and Multi-instance Architectures", 
-                    "previous_title": "Multitenant and Multi-instance Architectures Introduction", 
-                    "previous_url": "/docs/multitenant-and-multi-instance-architectures-introduction/", 
-                    "relative_path": "_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md", 
-                    "title": "How to Run Drill in a Cluster", 
-                    "url": "/docs/how-to-run-drill-in-a-cluster/"
-                }, 
-                {
-                    "breadcrumbs": [
-                        {
-                            "title": "Multitenant and Multi-instance Architectures", 
-                            "url": "/docs/multitenant-and-multi-instance-architectures/"
-                        }, 
-                        {
-                            "title": "Manage Drill", 
-                            "url": "/docs/manage-drill/"
-                        }
-                    ], 
-                    "children": [], 
-                    "next_title": "Configuration Options", 
-                    "next_url": "/docs/configuration-options/", 
-                    "parent": "Multitenant and Multi-instance Architectures", 
-                    "previous_title": "How to Run Drill in a Cluster", 
-                    "previous_url": "/docs/how-to-run-drill-in-a-cluster/", 
-                    "relative_path": "_docs/manage-drill/017-how-multiple-users-share-a-drillbit.md", 
-                    "title": "How Multiple Users Share a Drillbit", 
-                    "url": "/docs/how-multiple-users-share-a-drillbit/"
-                }
-            ], 
-            "next_title": "Multitenant and Multi-instance Architectures Introduction", 
-            "next_url": "/docs/multitenant-and-multi-instance-architectures-introduction/", 
-            "parent": "Manage Drill", 
-            "previous_title": "Configuring Memory", 
-            "previous_url": "/docs/configuring-memory/", 
-            "relative_path": "_docs/manage-drill/012-multitenant-and-multi-instance-architectures.md", 
-            "title": "Multitenant and Multi-instance Architectures", 
-            "url": "/docs/multitenant-and-multi-instance-architectures/"
-        }, 
-        "Multitenant and Multi-instance Architectures Introduction": {
-            "breadcrumbs": [
-                {
-                    "title": "Multitenant and Multi-instance Architectures", 
-                    "url": "/docs/multitenant-and-multi-instance-architectures/"
-                }, 
-                {
-                    "title": "Manage Drill", 
-                    "url": "/docs/manage-drill/"
-                }
-            ], 
-            "children": [], 
-            "next_title": "How to Run Drill in a Cluster", 
-            "next_url": "/docs/how-to-run-drill-in-a-cluster/", 
-            "parent": "Multitenant and Multi-instance Architectures", 
-            "previous_title": "Multitenant and Multi-instance Architectures", 
-            "previous_url": "/docs/multitenant-and-multi-instance-architectures/", 
-            "relative_path": "_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md", 
-            "title": "Multitenant and Multi-instance Architectures Introduction", 
-            "url": "/docs/multitenant-and-multi-instance-architectures-introduction/"
-        }, 
         "Nested Data Functions": {
             "breadcrumbs": [
                 {
@@ -4998,8 +4935,8 @@
                 }
             ], 
             "children": [], 
-            "next_title": "SQL Commands Summary", 
-            "next_url": "/docs/sql-commands-summary/", 
+            "next_title": "SQL Commands", 
+            "next_url": "/docs/sql-commands/", 
             "parent": "SQL Reference", 
             "previous_title": "REPEATED_CONTAINS", 
             "previous_url": "/docs/repeated-contains/", 
@@ -5704,8 +5641,8 @@
         "SELECT Statements": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -5715,18 +5652,18 @@
             "children": [], 
             "next_title": "SHOW DATABASES AND SHOW SCHEMAS Command", 
             "next_url": "/docs/show-databases-and-show-schemas-command/", 
-            "parent": "SQL Commands Summary", 
+            "parent": "SQL Commands", 
             "previous_title": "EXPLAIN commands", 
             "previous_url": "/docs/explain-commands/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/080-select.md", 
+            "relative_path": "_docs/sql-reference/sql-commands/080-select.md", 
             "title": "SELECT Statements", 
             "url": "/docs/select-statements/"
         }, 
         "SHOW DATABASES AND SHOW SCHEMAS Command": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -5736,18 +5673,18 @@
             "children": [], 
             "next_title": "SHOW FILES Command", 
             "next_url": "/docs/show-files-command/", 
-            "parent": "SQL Commands Summary", 
+            "parent": "SQL Commands", 
             "previous_title": "SELECT Statements", 
             "previous_url": "/docs/select-statements/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/090-show-databases-and-show-schemas.md", 
+            "relative_path": "_docs/sql-reference/sql-commands/090-show-databases-and-show-schemas.md", 
             "title": "SHOW DATABASES AND SHOW SCHEMAS Command", 
             "url": "/docs/show-databases-and-show-schemas-command/"
         }, 
         "SHOW FILES Command": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -5757,18 +5694,18 @@
             "children": [], 
             "next_title": "SHOW TABLES Command", 
             "next_url": "/docs/show-tables-command/", 
-            "parent": "SQL Commands Summary", 
+            "parent": "SQL Commands", 
             "previous_title": "SHOW DATABASES AND SHOW SCHEMAS Command", 
             "previous_url": "/docs/show-databases-and-show-schemas-command/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/100-show-files.md", 
+            "relative_path": "_docs/sql-reference/sql-commands/100-show-files.md", 
             "title": "SHOW FILES Command", 
             "url": "/docs/show-files-command/"
         }, 
         "SHOW TABLES Command": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -5778,14 +5715,14 @@
             "children": [], 
             "next_title": "USE Command", 
             "next_url": "/docs/use-command/", 
-            "parent": "SQL Commands Summary", 
+            "parent": "SQL Commands", 
             "previous_title": "SHOW FILES Command", 
             "previous_url": "/docs/show-files-command/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/110-show-tables-command.md", 
+            "relative_path": "_docs/sql-reference/sql-commands/110-show-tables-command.md", 
             "title": "SHOW TABLES Command", 
             "url": "/docs/show-tables-command/"
         }, 
-        "SQL Commands Summary": {
+        "SQL Commands": {
             "breadcrumbs": [
                 {
                     "title": "SQL Reference", 
@@ -5796,8 +5733,8 @@
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -5807,18 +5744,18 @@
                     "children": [], 
                     "next_title": "ALTER SESSION Command", 
                     "next_url": "/docs/alter-session-command/", 
-                    "parent": "SQL Commands Summary", 
-                    "previous_title": "SQL Commands Summary", 
-                    "previous_url": "/docs/sql-commands-summary/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/005-supported-sql-commands.md", 
+                    "parent": "SQL Commands", 
+                    "previous_title": "SQL Commands", 
+                    "previous_url": "/docs/sql-commands/", 
+                    "relative_path": "_docs/sql-reference/sql-commands/005-supported-sql-commands.md", 
                     "title": "Supported SQL Commands", 
                     "url": "/docs/supported-sql-commands/"
                 }, 
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -5828,18 +5765,18 @@
                     "children": [], 
                     "next_title": "ALTER SYSTEM Command", 
                     "next_url": "/docs/alter-system-command/", 
-                    "parent": "SQL Commands Summary", 
+                    "parent": "SQL Commands", 
                     "previous_title": "Supported SQL Commands", 
                     "previous_url": "/docs/supported-sql-commands/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/010-alter-session-command.md", 
+                    "relative_path": "_docs/sql-reference/sql-commands/010-alter-session-command.md", 
                     "title": "ALTER SESSION Command", 
                     "url": "/docs/alter-session-command/"
                 }, 
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -5849,18 +5786,18 @@
                     "children": [], 
                     "next_title": "CREATE TABLE AS (CTAS) command", 
                     "next_url": "/docs/create-table-as-ctas-command/", 
-                    "parent": "SQL Commands Summary", 
+                    "parent": "SQL Commands", 
                     "previous_title": "ALTER SESSION Command", 
                     "previous_url": "/docs/alter-session-command/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/020-alter-system.md", 
+                    "relative_path": "_docs/sql-reference/sql-commands/020-alter-system.md", 
                     "title": "ALTER SYSTEM Command", 
                     "url": "/docs/alter-system-command/"
                 }, 
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -5870,18 +5807,18 @@
                     "children": [], 
                     "next_title": "CREATE VIEW command", 
                     "next_url": "/docs/create-view-command/", 
-                    "parent": "SQL Commands Summary", 
+                    "parent": "SQL Commands", 
                     "previous_title": "ALTER SYSTEM Command", 
                     "previous_url": "/docs/alter-system-command/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/030-create-table-as-command.md", 
+                    "relative_path": "_docs/sql-reference/sql-commands/030-create-table-as-command.md", 
                     "title": "CREATE TABLE AS (CTAS) command", 
                     "url": "/docs/create-table-as-ctas-command/"
                 }, 
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -5891,18 +5828,18 @@
                     "children": [], 
                     "next_title": "DESCRIBE Command", 
                     "next_url": "/docs/describe-command/", 
-                    "parent": "SQL Commands Summary", 
+                    "parent": "SQL Commands", 
                     "previous_title": "CREATE TABLE AS (CTAS) command", 
                     "previous_url": "/docs/create-table-as-ctas-command/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/050-create-view-command.md", 
+                    "relative_path": "_docs/sql-reference/sql-commands/050-create-view-command.md", 
                     "title": "CREATE VIEW command", 
                     "url": "/docs/create-view-command/"
                 }, 
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -5912,18 +5849,18 @@
                     "children": [], 
                     "next_title": "EXPLAIN commands", 
                     "next_url": "/docs/explain-commands/", 
-                    "parent": "SQL Commands Summary", 
+                    "parent": "SQL Commands", 
                     "previous_title": "CREATE VIEW command", 
                     "previous_url": "/docs/create-view-command/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/060-describe-command.md", 
+                    "relative_path": "_docs/sql-reference/sql-commands/060-describe-command.md", 
                     "title": "DESCRIBE Command", 
                     "url": "/docs/describe-command/"
                 }, 
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -5933,18 +5870,18 @@
                     "children": [], 
                     "next_title": "SELECT Statements", 
                     "next_url": "/docs/select-statements/", 
-                    "parent": "SQL Commands Summary", 
+                    "parent": "SQL Commands", 
                     "previous_title": "DESCRIBE Command", 
                     "previous_url": "/docs/describe-command/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/070-explain-commands.md", 
+                    "relative_path": "_docs/sql-reference/sql-commands/070-explain-commands.md", 
                     "title": "EXPLAIN commands", 
                     "url": "/docs/explain-commands/"
                 }, 
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -5954,18 +5891,18 @@
                     "children": [], 
                     "next_title": "SHOW DATABASES AND SHOW SCHEMAS Command", 
                     "next_url": "/docs/show-databases-and-show-schemas-command/", 
-                    "parent": "SQL Commands Summary", 
+                    "parent": "SQL Commands", 
                     "previous_title": "EXPLAIN commands", 
                     "previous_url": "/docs/explain-commands/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/080-select.md", 
+                    "relative_path": "_docs/sql-reference/sql-commands/080-select.md", 
                     "title": "SELECT Statements", 
                     "url": "/docs/select-statements/"
                 }, 
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -5975,18 +5912,18 @@
                     "children": [], 
                     "next_title": "SHOW FILES Command", 
                     "next_url": "/docs/show-files-command/", 
-                    "parent": "SQL Commands Summary", 
+                    "parent": "SQL Commands", 
                     "previous_title": "SELECT Statements", 
                     "previous_url": "/docs/select-statements/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/090-show-databases-and-show-schemas.md", 
+                    "relative_path": "_docs/sql-reference/sql-commands/090-show-databases-and-show-schemas.md", 
                     "title": "SHOW DATABASES AND SHOW SCHEMAS Command", 
                     "url": "/docs/show-databases-and-show-schemas-command/"
                 }, 
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -5996,18 +5933,18 @@
                     "children": [], 
                     "next_title": "SHOW TABLES Command", 
                     "next_url": "/docs/show-tables-command/", 
-                    "parent": "SQL Commands Summary", 
+                    "parent": "SQL Commands", 
                     "previous_title": "SHOW DATABASES AND SHOW SCHEMAS Command", 
                     "previous_url": "/docs/show-databases-and-show-schemas-command/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/100-show-files.md", 
+                    "relative_path": "_docs/sql-reference/sql-commands/100-show-files.md", 
                     "title": "SHOW FILES Command", 
                     "url": "/docs/show-files-command/"
                 }, 
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -6017,18 +5954,18 @@
                     "children": [], 
                     "next_title": "USE Command", 
                     "next_url": "/docs/use-command/", 
-                    "parent": "SQL Commands Summary", 
+                    "parent": "SQL Commands", 
                     "previous_title": "SHOW FILES Command", 
                     "previous_url": "/docs/show-files-command/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/110-show-tables-command.md", 
+                    "relative_path": "_docs/sql-reference/sql-commands/110-show-tables-command.md", 
                     "title": "SHOW TABLES Command", 
                     "url": "/docs/show-tables-command/"
                 }, 
                 {
                     "breadcrumbs": [
                         {
-                            "title": "SQL Commands Summary", 
-                            "url": "/docs/sql-commands-summary/"
+                            "title": "SQL Commands", 
+                            "url": "/docs/sql-commands/"
                         }, 
                         {
                             "title": "SQL Reference", 
@@ -6038,10 +5975,10 @@
                     "children": [], 
                     "next_title": "SQL Conditional Expressions", 
                     "next_url": "/docs/sql-conditional-expressions/", 
-                    "parent": "SQL Commands Summary", 
+                    "parent": "SQL Commands", 
                     "previous_title": "SHOW TABLES Command", 
                     "previous_url": "/docs/show-tables-command/", 
-                    "relative_path": "_docs/sql-reference/sql-commands-summary/120-use-command.md", 
+                    "relative_path": "_docs/sql-reference/sql-commands/120-use-command.md", 
                     "title": "USE Command", 
                     "url": "/docs/use-command/"
                 }
@@ -6052,8 +5989,8 @@
             "previous_title": "Query Directory Functions", 
             "previous_url": "/docs/query-directory-functions/", 
             "relative_path": "_docs/sql-reference/070-sql-commands-summary.md", 
-            "title": "SQL Commands Summary", 
-            "url": "/docs/sql-commands-summary/"
+            "title": "SQL Commands", 
+            "url": "/docs/sql-commands/"
         }, 
         "SQL Conditional Expressions": {
             "breadcrumbs": [
@@ -6707,8 +6644,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "SQL Commands Summary", 
-                    "next_url": "/docs/sql-commands-summary/", 
+                    "next_title": "SQL Commands", 
+                    "next_url": "/docs/sql-commands/", 
                     "parent": "SQL Reference", 
                     "previous_title": "REPEATED_CONTAINS", 
                     "previous_url": "/docs/repeated-contains/", 
@@ -6727,8 +6664,8 @@
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6738,18 +6675,18 @@
                             "children": [], 
                             "next_title": "ALTER SESSION Command", 
                             "next_url": "/docs/alter-session-command/", 
-                            "parent": "SQL Commands Summary", 
-                            "previous_title": "SQL Commands Summary", 
-                            "previous_url": "/docs/sql-commands-summary/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/005-supported-sql-commands.md", 
+                            "parent": "SQL Commands", 
+                            "previous_title": "SQL Commands", 
+                            "previous_url": "/docs/sql-commands/", 
+                            "relative_path": "_docs/sql-reference/sql-commands/005-supported-sql-commands.md", 
                             "title": "Supported SQL Commands", 
                             "url": "/docs/supported-sql-commands/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6759,18 +6696,18 @@
                             "children": [], 
                             "next_title": "ALTER SYSTEM Command", 
                             "next_url": "/docs/alter-system-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "Supported SQL Commands", 
                             "previous_url": "/docs/supported-sql-commands/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/010-alter-session-command.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/010-alter-session-command.md", 
                             "title": "ALTER SESSION Command", 
                             "url": "/docs/alter-session-command/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6780,18 +6717,18 @@
                             "children": [], 
                             "next_title": "CREATE TABLE AS (CTAS) command", 
                             "next_url": "/docs/create-table-as-ctas-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "ALTER SESSION Command", 
                             "previous_url": "/docs/alter-session-command/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/020-alter-system.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/020-alter-system.md", 
                             "title": "ALTER SYSTEM Command", 
                             "url": "/docs/alter-system-command/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6801,18 +6738,18 @@
                             "children": [], 
                             "next_title": "CREATE VIEW command", 
                             "next_url": "/docs/create-view-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "ALTER SYSTEM Command", 
                             "previous_url": "/docs/alter-system-command/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/030-create-table-as-command.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/030-create-table-as-command.md", 
                             "title": "CREATE TABLE AS (CTAS) command", 
                             "url": "/docs/create-table-as-ctas-command/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6822,18 +6759,18 @@
                             "children": [], 
                             "next_title": "DESCRIBE Command", 
                             "next_url": "/docs/describe-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "CREATE TABLE AS (CTAS) command", 
                             "previous_url": "/docs/create-table-as-ctas-command/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/050-create-view-command.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/050-create-view-command.md", 
                             "title": "CREATE VIEW command", 
                             "url": "/docs/create-view-command/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6843,18 +6780,18 @@
                             "children": [], 
                             "next_title": "EXPLAIN commands", 
                             "next_url": "/docs/explain-commands/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "CREATE VIEW command", 
                             "previous_url": "/docs/create-view-command/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/060-describe-command.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/060-describe-command.md", 
                             "title": "DESCRIBE Command", 
                             "url": "/docs/describe-command/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6864,18 +6801,18 @@
                             "children": [], 
                             "next_title": "SELECT Statements", 
                             "next_url": "/docs/select-statements/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "DESCRIBE Command", 
                             "previous_url": "/docs/describe-command/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/070-explain-commands.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/070-explain-commands.md", 
                             "title": "EXPLAIN commands", 
                             "url": "/docs/explain-commands/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6885,18 +6822,18 @@
                             "children": [], 
                             "next_title": "SHOW DATABASES AND SHOW SCHEMAS Command", 
                             "next_url": "/docs/show-databases-and-show-schemas-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "EXPLAIN commands", 
                             "previous_url": "/docs/explain-commands/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/080-select.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/080-select.md", 
                             "title": "SELECT Statements", 
                             "url": "/docs/select-statements/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6906,18 +6843,18 @@
                             "children": [], 
                             "next_title": "SHOW FILES Command", 
                             "next_url": "/docs/show-files-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "SELECT Statements", 
                             "previous_url": "/docs/select-statements/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/090-show-databases-and-show-schemas.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/090-show-databases-and-show-schemas.md", 
                             "title": "SHOW DATABASES AND SHOW SCHEMAS Command", 
                             "url": "/docs/show-databases-and-show-schemas-command/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6927,18 +6864,18 @@
                             "children": [], 
                             "next_title": "SHOW TABLES Command", 
                             "next_url": "/docs/show-tables-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "SHOW DATABASES AND SHOW SCHEMAS Command", 
                             "previous_url": "/docs/show-databases-and-show-schemas-command/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/100-show-files.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/100-show-files.md", 
                             "title": "SHOW FILES Command", 
                             "url": "/docs/show-files-command/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6948,18 +6885,18 @@
                             "children": [], 
                             "next_title": "USE Command", 
                             "next_url": "/docs/use-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "SHOW FILES Command", 
                             "previous_url": "/docs/show-files-command/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/110-show-tables-command.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/110-show-tables-command.md", 
                             "title": "SHOW TABLES Command", 
                             "url": "/docs/show-tables-command/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -6969,10 +6906,10 @@
                             "children": [], 
                             "next_title": "SQL Conditional Expressions", 
                             "next_url": "/docs/sql-conditional-expressions/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "SHOW TABLES Command", 
                             "previous_url": "/docs/show-tables-command/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/120-use-command.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/120-use-command.md", 
                             "title": "USE Command", 
                             "url": "/docs/use-command/"
                         }
@@ -6983,8 +6920,8 @@
                     "previous_title": "Query Directory Functions", 
                     "previous_url": "/docs/query-directory-functions/", 
                     "relative_path": "_docs/sql-reference/070-sql-commands-summary.md", 
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -7249,8 +7186,8 @@
             "next_title": "Planning and Execution Options", 
             "next_url": "/docs/planning-and-execution-options/", 
             "parent": "Configuration Options", 
-            "previous_title": "Configuring a Cluster for Different Workloads", 
-            "previous_url": "/docs/configuring-a-cluster-for-different-workloads/", 
+            "previous_title": "Configuration Options Introduction", 
+            "previous_url": "/docs/configuration-options-introduction/", 
             "relative_path": "_docs/manage-drill/configuration-options/020-start-up-options.md", 
             "title": "Start-Up Options", 
             "url": "/docs/start-up-options/"
@@ -7520,8 +7457,8 @@
         "Supported SQL Commands": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -7531,10 +7468,10 @@
             "children": [], 
             "next_title": "ALTER SESSION Command", 
             "next_url": "/docs/alter-session-command/", 
-            "parent": "SQL Commands Summary", 
-            "previous_title": "SQL Commands Summary", 
-            "previous_url": "/docs/sql-commands-summary/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/005-supported-sql-commands.md", 
+            "parent": "SQL Commands", 
+            "previous_title": "SQL Commands", 
+            "previous_url": "/docs/sql-commands/", 
+            "relative_path": "_docs/sql-reference/sql-commands/005-supported-sql-commands.md", 
             "title": "Supported SQL Commands", 
             "url": "/docs/supported-sql-commands/"
         }, 
@@ -7846,8 +7783,8 @@
         "USE Command": {
             "breadcrumbs": [
                 {
-                    "title": "SQL Commands Summary", 
-                    "url": "/docs/sql-commands-summary/"
+                    "title": "SQL Commands", 
+                    "url": "/docs/sql-commands/"
                 }, 
                 {
                     "title": "SQL Reference", 
@@ -7857,10 +7794,10 @@
             "children": [], 
             "next_title": "SQL Conditional Expressions", 
             "next_url": "/docs/sql-conditional-expressions/", 
-            "parent": "SQL Commands Summary", 
+            "parent": "SQL Commands", 
             "previous_title": "SHOW TABLES Command", 
             "previous_url": "/docs/show-tables-command/", 
-            "relative_path": "_docs/sql-reference/sql-commands-summary/120-use-command.md", 
+            "relative_path": "_docs/sql-reference/sql-commands/120-use-command.md", 
             "title": "USE Command", 
             "url": "/docs/use-command/"
         }, 
@@ -10363,8 +10300,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "SQL Commands Summary", 
-                    "next_url": "/docs/sql-commands-summary/", 
+                    "next_title": "SQL Commands", 
+                    "next_url": "/docs/sql-commands/", 
                     "parent": "SQL Reference", 
                     "previous_title": "REPEATED_CONTAINS", 
                     "previous_url": "/docs/repeated-contains/", 
@@ -10383,8 +10320,8 @@
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -10394,18 +10331,18 @@
                             "children": [], 
                             "next_title": "ALTER SESSION Command", 
                             "next_url": "/docs/alter-session-command/", 
-                            "parent": "SQL Commands Summary", 
-                            "previous_title": "SQL Commands Summary", 
-                            "previous_url": "/docs/sql-commands-summary/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/005-supported-sql-commands.md", 
+                            "parent": "SQL Commands", 
+                            "previous_title": "SQL Commands", 
+                            "previous_url": "/docs/sql-commands/", 
+                            "relative_path": "_docs/sql-reference/sql-commands/005-supported-sql-commands.md", 
                             "title": "Supported SQL Commands", 
                             "url": "/docs/supported-sql-commands/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -10415,18 +10352,18 @@
                             "children": [], 
                             "next_title": "ALTER SYSTEM Command", 
                             "next_url": "/docs/alter-system-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "Supported SQL Commands", 
                             "previous_url": "/docs/supported-sql-commands/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/010-alter-session-command.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/010-alter-session-command.md", 
                             "title": "ALTER SESSION Command", 
                             "url": "/docs/alter-session-command/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -10436,18 +10373,18 @@
                             "children": [], 
                             "next_title": "CREATE TABLE AS (CTAS) command", 
                             "next_url": "/docs/create-table-as-ctas-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "ALTER SESSION Command", 
                             "previous_url": "/docs/alter-session-command/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/020-alter-system.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/020-alter-system.md", 
                             "title": "ALTER SYSTEM Command", 
                             "url": "/docs/alter-system-command/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -10457,18 +10394,18 @@
                             "children": [], 
                             "next_title": "CREATE VIEW command", 
                             "next_url": "/docs/create-view-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "ALTER SYSTEM Command", 
                             "previous_url": "/docs/alter-system-command/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/030-create-table-as-command.md", 
+                            "relative_path": "_docs/sql-reference/sql-commands/030-create-table-as-command.md", 
                             "title": "CREATE TABLE AS (CTAS) command", 
                             "url": "/docs/create-table-as-ctas-command/"
                         }, 
                         {
                             "breadcrumbs": [
                                 {
-                                    "title": "SQL Commands Summary", 
-                                    "url": "/docs/sql-commands-summary/"
+                                    "title": "SQL Commands", 
+                                    "url": "/docs/sql-commands/"
                                 }, 
                                 {
                                     "title": "SQL Reference", 
@@ -10478,18 +10415,18 @@
                             "children": [], 
                             "next_title": "DESCRIBE Command", 
                             "next_url": "/docs/describe-command/", 
-                            "parent": "SQL Commands Summary", 
+                            "parent": "SQL Commands", 
                             "previous_title": "CREATE TABLE AS (CTAS) command", 
                             "previous_url": "/docs/create-table-as-ctas-command/", 
-                            "relative_path": "_docs/sql-reference/sql-commands-summary/050-create

<TRUNCATED>

[32/50] [abbrv] drill git commit: memory allocation > configuring memory, separate topic

Posted by ts...@apache.org.
memory allocation > configuring memory, separate topic


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

Branch: refs/heads/gh-pages
Commit: bf05a8e383a973c743489325ce39bd13d9709727
Parents: a4264b9
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 10:32:52 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 10:32:52 2015 -0700

----------------------------------------------------------------------
 _data/docs.json                                 | 75 ++++++++++++++++----
 _docs/manage-drill/011-configuring-memory.md    | 32 +++++++++
 ...-multi-instance-architecture-introduction.md |  2 +-
 .../015-how-to-run-drill-in-a-cluster.md        | 20 +-----
 .../010-configuration-options-introduction.md   | 29 --------
 5 files changed, 97 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/bf05a8e3/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index 79468f4..d016d92 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -856,6 +856,23 @@
             "title": "Configuring Connections on Windows", 
             "url": "/docs/configuring-connections-on-windows/"
         }, 
+        "Configuring Memory": {
+            "breadcrumbs": [
+                {
+                    "title": "Manage Drill", 
+                    "url": "/docs/manage-drill/"
+                }
+            ], 
+            "children": [], 
+            "next_title": "Multitenant and Multi-instance Architectures", 
+            "next_url": "/docs/multitenant-and-multi-instance-architectures/", 
+            "parent": "Manage Drill", 
+            "previous_title": "Manage Drill Introduction", 
+            "previous_url": "/docs/manage-drill-introduction/", 
+            "relative_path": "_docs/manage-drill/011-configuring-memory.md", 
+            "title": "Configuring Memory", 
+            "url": "/docs/configuring-memory/"
+        }, 
         "Configuring a Cluster for Different Workloads": {
             "breadcrumbs": [
                 {
@@ -3381,8 +3398,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Multitenant and Multi-instance Architectures", 
-                    "next_url": "/docs/multitenant-and-multi-instance-architectures/", 
+                    "next_title": "Configuring Memory", 
+                    "next_url": "/docs/configuring-memory/", 
                     "parent": "Manage Drill", 
                     "previous_title": "Manage Drill", 
                     "previous_url": "/docs/manage-drill/", 
@@ -3397,6 +3414,23 @@
                             "url": "/docs/manage-drill/"
                         }
                     ], 
+                    "children": [], 
+                    "next_title": "Multitenant and Multi-instance Architectures", 
+                    "next_url": "/docs/multitenant-and-multi-instance-architectures/", 
+                    "parent": "Manage Drill", 
+                    "previous_title": "Manage Drill Introduction", 
+                    "previous_url": "/docs/manage-drill-introduction/", 
+                    "relative_path": "_docs/manage-drill/011-configuring-memory.md", 
+                    "title": "Configuring Memory", 
+                    "url": "/docs/configuring-memory/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Manage Drill", 
+                            "url": "/docs/manage-drill/"
+                        }
+                    ], 
                     "children": [
                         {
                             "breadcrumbs": [
@@ -3465,8 +3499,8 @@
                     "next_title": "Multitenant and Multi-instance Architectures Introduction", 
                     "next_url": "/docs/multitenant-and-multi-instance-architectures-introduction/", 
                     "parent": "Manage Drill", 
-                    "previous_title": "Manage Drill Introduction", 
-                    "previous_url": "/docs/manage-drill-introduction/", 
+                    "previous_title": "Configuring Memory", 
+                    "previous_url": "/docs/configuring-memory/", 
                     "relative_path": "_docs/manage-drill/012-multitenant-and-multi-instance-architectures.md", 
                     "title": "Multitenant and Multi-instance Architectures", 
                     "url": "/docs/multitenant-and-multi-instance-architectures/"
@@ -3680,8 +3714,8 @@
                 }
             ], 
             "children": [], 
-            "next_title": "Multitenant and Multi-instance Architectures", 
-            "next_url": "/docs/multitenant-and-multi-instance-architectures/", 
+            "next_title": "Configuring Memory", 
+            "next_url": "/docs/configuring-memory/", 
             "parent": "Manage Drill", 
             "previous_title": "Manage Drill", 
             "previous_url": "/docs/manage-drill/", 
@@ -3836,8 +3870,8 @@
             "next_title": "Multitenant and Multi-instance Architectures Introduction", 
             "next_url": "/docs/multitenant-and-multi-instance-architectures-introduction/", 
             "parent": "Manage Drill", 
-            "previous_title": "Manage Drill Introduction", 
-            "previous_url": "/docs/manage-drill-introduction/", 
+            "previous_title": "Configuring Memory", 
+            "previous_url": "/docs/configuring-memory/", 
             "relative_path": "_docs/manage-drill/012-multitenant-and-multi-instance-architectures.md", 
             "title": "Multitenant and Multi-instance Architectures", 
             "url": "/docs/multitenant-and-multi-instance-architectures/"
@@ -10915,8 +10949,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Multitenant and Multi-instance Architectures", 
-                    "next_url": "/docs/multitenant-and-multi-instance-architectures/", 
+                    "next_title": "Configuring Memory", 
+                    "next_url": "/docs/configuring-memory/", 
                     "parent": "Manage Drill", 
                     "previous_title": "Manage Drill", 
                     "previous_url": "/docs/manage-drill/", 
@@ -10931,6 +10965,23 @@
                             "url": "/docs/manage-drill/"
                         }
                     ], 
+                    "children": [], 
+                    "next_title": "Multitenant and Multi-instance Architectures", 
+                    "next_url": "/docs/multitenant-and-multi-instance-architectures/", 
+                    "parent": "Manage Drill", 
+                    "previous_title": "Manage Drill Introduction", 
+                    "previous_url": "/docs/manage-drill-introduction/", 
+                    "relative_path": "_docs/manage-drill/011-configuring-memory.md", 
+                    "title": "Configuring Memory", 
+                    "url": "/docs/configuring-memory/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Manage Drill", 
+                            "url": "/docs/manage-drill/"
+                        }
+                    ], 
                     "children": [
                         {
                             "breadcrumbs": [
@@ -10999,8 +11050,8 @@
                     "next_title": "Multitenant and Multi-instance Architectures Introduction", 
                     "next_url": "/docs/multitenant-and-multi-instance-architectures-introduction/", 
                     "parent": "Manage Drill", 
-                    "previous_title": "Manage Drill Introduction", 
-                    "previous_url": "/docs/manage-drill-introduction/", 
+                    "previous_title": "Configuring Memory", 
+                    "previous_url": "/docs/configuring-memory/", 
                     "relative_path": "_docs/manage-drill/012-multitenant-and-multi-instance-architectures.md", 
                     "title": "Multitenant and Multi-instance Architectures", 
                     "url": "/docs/multitenant-and-multi-instance-architectures/"

http://git-wip-us.apache.org/repos/asf/drill/blob/bf05a8e3/_docs/manage-drill/011-configuring-memory.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/011-configuring-memory.md b/_docs/manage-drill/011-configuring-memory.md
new file mode 100644
index 0000000..9058cdb
--- /dev/null
+++ b/_docs/manage-drill/011-configuring-memory.md
@@ -0,0 +1,32 @@
+---
+title: "Configuring Memory"
+parent: "Manage Drill"
+---
+
+You can configure the amount of direct memory allocated to a Drillbit for
+query processing. The default limit is 8G, but Drill prefers 16G or more
+depending on the workload. The total amount of direct memory that a Drillbit
+allocates to query operations cannot exceed the limit set.
+
+Drill mainly uses Java direct memory and performs well when executing
+operations in memory instead of storing the operations on disk. Drill does not
+write to disk unless absolutely necessary, unlike MapReduce where everything
+is written to disk during each phase of a job.
+
+The JVM’s heap memory does not limit the amount of direct memory available in
+a Drillbit. The on-heap memory for Drill is only about 4-8G, which should
+suffice because Drill avoids having data sit in heap memory.
+
+## Modifying Drillbit Memory
+
+You can modify memory for each Drillbit node in your cluster. To modify the
+memory for a Drillbit, edit the `XX:MaxDirectMemorySize` parameter in the
+Drillbit startup script located in `<drill_installation_directory>/conf/drill-
+env.sh`.
+
+{% include startnote.html %}If this parameter is not set, the limit depends on the amount of available system memory.{% include endnote.html %}
+
+After you edit `<drill_installation_directory>/conf/drill-env.sh`, [restart
+the Drillbit
+]({{ site.baseurl }}/docs/starting-stopping-drill#starting-a-drillbit)on
+the node.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/bf05a8e3/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md b/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
index 33c0b98..c517586 100644
--- a/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
+++ b/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
@@ -15,7 +15,7 @@ Drill typically runs along side many application frameworks, including the follo
 
 You need to plan and configure these resources for use with Drill in a multitenant or multi-instance environment: 
 
-* [Memory]()  
+* [Memory]({{site.baseurl}}/docs/configuring-memory)  
 * [CPU]({{site.baseurl}}/docs/how-to-manage-drill-cpu-resources)  
 * Disk  
 

http://git-wip-us.apache.org/repos/asf/drill/blob/bf05a8e3/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md b/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
index f407bdb..d8609c5 100644
--- a/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
+++ b/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
@@ -23,25 +23,7 @@ To run Drill in a MapR cluster, allocate memory by configuring settings in warde
 
 ### Drill Memory
 You can configure the amount of direct memory allocated to a Drillbit for
-query processing. The default limit is 8G, but Drill prefers 16G or more
-depending on the workload. The total amount of direct memory that a Drillbit
-allocates to query operations cannot exceed the limit set.
-
-Drill mainly uses Java direct memory and performs well when executing
-operations in memory instead of storing the operations on disk. Drill does not
-write to disk unless absolutely necessary, unlike MapReduce where everything
-is written to disk during each phase of a job.
-
-The JVM’s heap memory does not limit the amount of direct memory available in
-a Drillbit. The on-heap memory for Drill is only about 4-8G, which should
-suffice because Drill avoids having data sit in heap memory.
-
-You can modify memory for each Drillbit node in your cluster. To modify the
-memory for a Drillbit, edit the `XX:MaxDirectMemorySize` parameter in the
-Drillbit startup script located in `<drill_installation_directory>/conf/drill-
-env.sh`.
-
-If this parameter is not set, the limit depends on the amount of available system memory.
+query processing, as described in the section, ["Configuring Memory"](({{site.baseurl}}/docs/configuring-memory).
 
 ### Memory in a MapR Cluster
 Memory and disk for Drill and other services that are not associated with roles on a MapR cluster are shared with other services. You manage the chunk of memory for these services in os heap settings in `warden.conf` and in configuration files of the particular service. The warden os heap settings are:

http://git-wip-us.apache.org/repos/asf/drill/blob/bf05a8e3/_docs/manage-drill/configuration-options/010-configuration-options-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/configuration-options/010-configuration-options-introduction.md b/_docs/manage-drill/configuration-options/010-configuration-options-introduction.md
index ab5370b..e49b17a 100644
--- a/_docs/manage-drill/configuration-options/010-configuration-options-introduction.md
+++ b/_docs/manage-drill/configuration-options/010-configuration-options-introduction.md
@@ -405,32 +405,3 @@ The sys.options table lists the following options that you can set at the sessio
 
 \* Not supported in this release.
 
-## Memory Allocation
-
-You can configure the amount of direct memory allocated to a Drillbit for
-query processing. The default limit is 8G, but Drill prefers 16G or more
-depending on the workload. The total amount of direct memory that a Drillbit
-allocates to query operations cannot exceed the limit set.
-
-Drill mainly uses Java direct memory and performs well when executing
-operations in memory instead of storing the operations on disk. Drill does not
-write to disk unless absolutely necessary, unlike MapReduce where everything
-is written to disk during each phase of a job.
-
-The JVM’s heap memory does not limit the amount of direct memory available in
-a Drillbit. The on-heap memory for Drill is only about 4-8G, which should
-suffice because Drill avoids having data sit in heap memory.
-
-## Modifying Drillbit Memory
-
-You can modify memory for each Drillbit node in your cluster. To modify the
-memory for a Drillbit, edit the `XX:MaxDirectMemorySize` parameter in the
-Drillbit startup script located in `<drill_installation_directory>/conf/drill-
-env.sh`.
-
-{% include startnote.html %}If this parameter is not set, the limit depends on the amount of available system memory.{% include endnote.html %}
-
-After you edit `<drill_installation_directory>/conf/drill-env.sh`, [restart
-the Drillbit
-]({{ site.baseurl }}/docs/starting-stopping-drill#starting-a-drillbit)on
-the node.
\ No newline at end of file


[26/50] [abbrv] drill git commit: NR's review

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


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

Branch: refs/heads/gh-pages
Commit: 26b0b393223fd77a36396505bca2254334ea7e75
Parents: 0ac6ebc
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 08:30:09 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 08:30:09 2015 -0700

----------------------------------------------------------------------
 ...and-multi-instance-architecture-introduction.md |  7 +++----
 .../015-how-to-run-drill-in-a-cluster.md           | 17 +++++++----------
 2 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/26b0b393/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md b/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
index 921d8d2..33c0b98 100644
--- a/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
+++ b/_docs/manage-drill/013-multitenant-and-multi-instance-architecture-introduction.md
@@ -12,12 +12,11 @@ Drill typically runs along side many application frameworks, including the follo
 * HBase  
 * Hive and Pig  
 * Spark  
-* Sqoop  
 
-You need to plan and configure the resources for use with Drill in a multitenant or multi-instance environment. Currently, you can configure the following resources:
+You need to plan and configure these resources for use with Drill in a multitenant or multi-instance environment: 
 
-* Memory  
-* CPU  
+* [Memory]()  
+* [CPU]({{site.baseurl}}/docs/how-to-manage-drill-cpu-resources)  
 * Disk  
 
 ["How to Run Drill in a Cluster"]({{site.baseurl}}/docs/how-to-run-drill-in-a-cluster) covers configuration for a multitenant environment and ["How Multiple Users Share a Drillbit"]({{site.baseurl}}/docs/how-multiple-users-share-a-drillbit) covers configuration for a multi-instance environment.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/26b0b393/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md b/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
index 3bf5a2d..f407bdb 100644
--- a/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
+++ b/_docs/manage-drill/015-how-to-run-drill-in-a-cluster.md
@@ -17,11 +17,11 @@ For information about Drill and Yarn, see [DRILL-142](https://issues.apache.org/
 
 ## Managing Memory
 
-To run Drill in a cluster with MapReduce, HBase, Spark, and other workloads, allocate memory in the same manner according to your application needs. 
+To run Drill in a cluster with MapReduce, HBase, Spark, and other workloads, manage memory according to your application needs. 
 
 To run Drill in a MapR cluster, allocate memory by configuring settings in warden.conf, as described in the [MapR documentation]().
 
-## Allocating Memory for Drill
+### Drill Memory
 You can configure the amount of direct memory allocated to a Drillbit for
 query processing. The default limit is 8G, but Drill prefers 16G or more
 depending on the workload. The total amount of direct memory that a Drillbit
@@ -43,20 +43,17 @@ env.sh`.
 
 If this parameter is not set, the limit depends on the amount of available system memory.
 
-### Managing Memory in a Yarn-enabled Cluster
-TBD
-
-### Managing Memory in MapReduce, HBase, Spark, and other clusters
-TBD
-
-### Managing Memory in a MapR Cluster
+### Memory in a MapR Cluster
 Memory and disk for Drill and other services that are not associated with roles on a MapR cluster are shared with other services. You manage the chunk of memory for these services in os heap settings in `warden.conf` and in configuration files of the particular service. The warden os heap settings are:
 
     service.command.os.heapsize.percent
     service.command.os.heapsize.max
     service.command.os.heapsize.min
 
-For more information about managing memory in a MapR cluster, see [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes) in the MapR documentation.
+For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
+* [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)
+* [Cluster Resource Allocation](http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation)
+* [Customizing Memory Settings for MapReduce v1](http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1)
 
 ## How to Manage Drill CPU Resources
 Currently, you do not manage CPU resources within Drill. [Use Linux `cgroups`](http://en.wikipedia.org/wiki/Cgroups) to manage the CPU resources.
\ No newline at end of file


[23/50] [abbrv] drill git commit: format example again

Posted by ts...@apache.org.
format example again


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

Branch: refs/heads/gh-pages
Commit: 26aa96b1703e25242ccc62da76069f1c15a8dd24
Parents: a65a9f4
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 08:18:33 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 08:18:33 2015 -0700

----------------------------------------------------------------------
 .../060-hbase-storage-plugin.md                 | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/26aa96b1/_docs/connect-a-data-source/060-hbase-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/060-hbase-storage-plugin.md b/_docs/connect-a-data-source/060-hbase-storage-plugin.md
index acc12c1..693e487 100644
--- a/_docs/connect-a-data-source/060-hbase-storage-plugin.md
+++ b/_docs/connect-a-data-source/060-hbase-storage-plugin.md
@@ -16,17 +16,17 @@ To register HBase with Drill, complete the following steps:
   3. In the Configuration window, specify the Zookeeper quorum and port. 
   
 
-     **Example**
-     
-          {
-            "type": "hbase",
-            "config": {
-              "hbase.zookeeper.quorum": "10.10.100.62,10.10.10.52,10.10.10.53",
-              "hbase.zookeeper.property.clientPort": "2181"
-            },
-            "size.calculator.enabled": false,
-            "enabled": true
-          }
+     **Example**  
+
+            {
+              "type": "hbase",
+              "config": {
+                "hbase.zookeeper.quorum": "10.10.100.62,10.10.10.52,10.10.10.53",
+                "hbase.zookeeper.property.clientPort": "2181"
+              },
+              "size.calculator.enabled": false,
+              "enabled": true
+            }
 
   4. Click **Enable**.
 


[41/50] [abbrv] drill git commit: commands reorg

Posted by ts...@apache.org.
commands reorg


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

Branch: refs/heads/gh-pages
Commit: 7635267079aca18985b47b97b1d80f0ef8815ce9
Parents: 3f4d05b
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 17:08:31 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 17:08:31 2015 -0700

----------------------------------------------------------------------
 _data/docs.json                                 | 1000 ++++++++----------
 .../010-manage-drill-introduction.md            |    6 +-
 _docs/manage-drill/011-configuring-memory.md    |    2 +-
 .../012-configuring-different-workloads.md      |    5 +
 ...titenant-and-multi-instance-architectures.md |    5 -
 ...nfiguring-dfferent-workloads-introduction.md |   22 +
 ...-multi-instance-architecture-introduction.md |   22 -
 .../015-configuring-drill-in-a-cluster.md       |   78 ++
 .../015-how-to-run-drill-in-a-cluster.md        |   41 -
 .../017-configuring-a-shared-drillbit.md        |   65 ++
 .../017-how-multiple-users-share-a-drillbit.md  |   65 --
 ...iguring-a-cluster-for-different-workloads.md |   61 --
 _docs/sql-reference/070-sql-commands-summary.md |    2 +-
 .../005-supported-sql-commands.md               |    9 -
 .../010-alter-session-command.md                |   74 --
 .../sql-commands-summary/020-alter-system.md    |  102 --
 .../030-create-table-as-command.md              |  134 ---
 .../050-create-view-command.md                  |  197 ----
 .../060-describe-command.md                     |   99 --
 .../070-explain-commands.md                     |  156 ---
 .../sql-commands-summary/080-select.md          |  178 ----
 .../090-show-databases-and-show-schemas.md      |   59 --
 .../sql-commands-summary/100-show-files.md      |   65 --
 .../110-show-tables-command.md                  |  136 ---
 .../sql-commands-summary/120-use-command.md     |  170 ---
 .../sql-commands/005-supported-sql-commands.md  |    9 +
 .../sql-commands/010-alter-session-command.md   |   74 ++
 .../sql-commands/020-alter-system.md            |  102 ++
 .../sql-commands/030-create-table-as-command.md |  134 +++
 .../sql-commands/050-create-view-command.md     |  197 ++++
 .../sql-commands/060-describe-command.md        |   99 ++
 .../sql-commands/070-explain-commands.md        |  156 +++
 _docs/sql-reference/sql-commands/080-select.md  |  178 ++++
 .../090-show-databases-and-show-schemas.md      |   59 ++
 .../sql-commands/100-show-files.md              |   65 ++
 .../sql-commands/110-show-tables-command.md     |  136 +++
 .../sql-commands/120-use-command.md             |  170 +++
 37 files changed, 2012 insertions(+), 2120 deletions(-)
----------------------------------------------------------------------



[34/50] [abbrv] drill git commit: Bob's edit

Posted by ts...@apache.org.
Bob's edit


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

Branch: refs/heads/gh-pages
Commit: 0d62e5466983f77220c6af128cacbe231099b74b
Parents: ffbf1d3
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 13:26:23 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 13:26:23 2015 -0700

----------------------------------------------------------------------
 _docs/sql-reference/data-types/010-supported-data-types.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/0d62e546/_docs/sql-reference/data-types/010-supported-data-types.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/data-types/010-supported-data-types.md b/_docs/sql-reference/data-types/010-supported-data-types.md
index a789426..c86bccd 100644
--- a/_docs/sql-reference/data-types/010-supported-data-types.md
+++ b/_docs/sql-reference/data-types/010-supported-data-types.md
@@ -82,9 +82,8 @@ Drill reads from and writes to data sources having a wide variety of types. Dril
   </tr>
 </table>
 \* Not currently supported.  
-\*\* Currently, Drill supports only variable-length strings. .
-\*\*\* In this release the NUMERIC data type is an alias for the DECIMAL data type.
-+  
+\*\* Currently, Drill supports only variable-length strings.  
+\*\*\* In this release, the NUMERIC data type is an alias for the DECIMAL data type.  
 
 ## Casting and Converting Data Types
 


[48/50] [abbrv] drill git commit: minor edits

Posted by ts...@apache.org.
minor edits


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

Branch: refs/heads/gh-pages
Commit: c9749065631d2260b541b999fecb0b6a9545a706
Parents: c010ca8
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Fri May 1 10:51:26 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Fri May 1 10:51:26 2015 -0700

----------------------------------------------------------------------
 ...nfiguring-dfferent-workloads-introduction.md |  2 +-
 .../015-configuring-drill-in-a-cluster.md       | 38 +++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/c9749065/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
index fe87179..737ef79 100644
--- a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
+++ b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
@@ -19,4 +19,4 @@ You need to plan and configure these resources for use with Drill and other work
 * [CPU]({{site.baseurl}}/docs/configuring-drill-in-a-cluster#how-to-manage-drill-cpu-resources)  
 * Disk  
 
-Configure, memory, queues, and parallelization ["when users share a Drillbit"]({{site.baseurl}}/docs/configuring-resources-for-a-shared-drillbit).
\ No newline at end of file
+Configure, memory, queues, and parallelization when users [share a Drillbit]({{site.baseurl}}/docs/configuring-resources-for-a-shared-drillbit).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/c9749065/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
index a5c124b..9e46732 100644
--- a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
+++ b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
@@ -1,29 +1,28 @@
----
+    ---
 title: "Configuring Resources in a Mixed Cluster"
 parent: "Configuring Different Workloads"
 ---
-Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designate which partition handles which workload. 
+Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designate which partition handles which workload. To configure resources for Drill in a MapR cluster, modify one or more of the following files in `/opt/mapr/conf/conf.d` that the installation process creates. 
 
-## Configuring Drill Memory in a Mixed Cluster
+* `warden.drill-bits.conf`
+* `warden.nodemanager.conf`
+* `warden.resourcemanager.conf`
 
-To configure memory resources for Drill, you modify the `warden.drill-bits.conf` file in `/opt/mapr/conf/conf.d`. This file is created automatically when you install Drill on a node. 
+Configure Drill memory by modifying `warden.drill-bits.conf` in YARN and non-YARN clusters. Configure other resources by modifying `warden.nodemanager.conf `and `warden.resourcemanager.conf `in a YARN-enabled cluster.
 
-    [root@centos23 conf.d]# pwd
-    /opt/mapr/conf/conf.d
-    [root@centos23 conf.d]# ls
-    warden.drill-bits.conf  warden.nodemanager.conf  warden.resourcemanager.conf
+## Configuring Drill Memory in a Mixed Cluster
 
-You add the following lines to the wardens.drill-bits.conf file to configure memory resources for Drill:
+Add the following lines to the `warden.drill-bits.conf` file to configure memory resources for Drill:
 
     service.heapsize.min=<some value in MB>
     service.heapsize.max=<some value in MB>
     service.heapsize.percent=<a whole number>
 
-This service.heapsize.percent is the percentage of memory for the service bounded by min and max values.
+The service.heapsize.percent is the percentage of memory for the service bounded by minimum and maximum values.
 
 ## Configuring Drill in a YARN-enabled MapR Cluster
 
-To add Drill to a YARN-enabled cluster, you change memory resources depending on your application. For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
+To add Drill to a YARN-enabled cluster, change memory resources to suit your application. For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
 
 File system = 20G  
 HBase = 20G  
@@ -41,23 +40,27 @@ YARN consists of two main services:
 * NodeManager  
   There is one instance per node. 
 
-Configure ResourceManager and NodeManager memory in `/opt/mapr/conf/conf.d/warden.resourcemanager.conf` and
- `/opt/mapr/conf/conf.d/warden.nodemanager.conf`. Configure the following warden.nodemanager.conf settings. The defaults are:
+ResourceManager and NodeManager memory in `warden.resourcemanager.conf` and
+ `warden.nodemanager.conf` are set to the following defaults. 
 
     service.heapsize.min=64
     service.heapsize.max=325
     service.heapsize.percent=2
 
-Memory allocation for NodeManager and ResourceManager is used only to calculate total memory required for all services to run. The -Xmx option is not set, allowing memory on to grow as needed. If you want to place an upper limit on memory set YARN_NODEMANAGER_HEAPSIZE or YARN_RESOURCEMANAGER_HEAPSIZE environment variable in /opt/mapr/hadoop/hadoop-2.5.1/etc/hadoop/yarn-env.sh.
+Change these settings for NodeManager and ResourceManager to reconfigure the total memory required for YARN services to run. If you want to place an upper limit on memory set YARN_NODEMANAGER_HEAPSIZE or YARN_RESOURCEMANAGER_HEAPSIZE environment variable in /opt/mapr/hadoop/hadoop-2.5.1/etc/hadoop/yarn-env.sh. The -Xmx option is not set, allowing memory on to grow as needed.
 
 ### MapReduce v1 Resources
 
-To configure memory for MapReduce v1 resources set mr1.memory.percent, mr1.cpu.percent and mr1.disk.percent in warden.conf, as described in section ["Resource Allocation for Jobs and Applications"](http://doc.mapr.com/display/MapR/Resource+Allocation+for+Jobs+and+Applications) of the MapR documentation. Remaining memory is given to YARN applications. 
+The following default settings in /opt/mapr/conf/warden.conf control MapReduce v1 memory:
 
+    mr1.memory.percent=50
+    mr1.cpu.percent=50
+    mr1.disk.percent=50
+
+Modify these settings to reconfigure MapReduce v1 resources to suit your application needs, as described in section ["Resource Allocation for Jobs and Applications"](http://doc.mapr.com/display/MapR/Resource+Allocation+for+Jobs+and+Applications) of the MapR documentation. Remaining memory is given to YARN applications. 
 
-### MapReduce v2 and other Resources
 
-Similar files exist for other installed services, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf). 
+### MapReduce v2 and other Resources
 
 You configure memory for each service by setting three values in `warden.conf`.
 
@@ -65,6 +68,7 @@ You configure memory for each service by setting three values in `warden.conf`.
     service.command.<servicename>.heapsize.max
     service.command.<servicename>.heapsize.min
 
+Configure memory for other services in the same manner, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf)
 
 For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
 * [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)


[10/50] [abbrv] drill git commit: MD-123 edit

Posted by ts...@apache.org.
MD-123 edit


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

Branch: refs/heads/gh-pages
Commit: a0f5e42138ccce2779479083be326e6e10e500f7
Parents: 9ea1dc5
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Apr 29 16:21:30 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Apr 29 16:21:30 2015 -0700

----------------------------------------------------------------------
 .../010-installing-the-driver-on-windows.md                      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/a0f5e421/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
index f449ab2..431cdf1 100755
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/010-installing-the-driver-on-windows.md
@@ -56,9 +56,7 @@ The MapR Drill ODBC driver installer installs the TDC file automatically. If you
   2. When the installation completes, press any key to continue.   
 For example, you can press the SPACEBAR key.
 
-If the installation of the Tableau datasource connection (TDC) file fails, this is likely due to your Tableau repository being in a different location.  In this case, you should manually copy the TDC file to one of the following locations:
+If the installation of the Tableau datasource connection (TDC) file fails, this is likely due to your Tableau repository being in a different location.  In this case, you should manually copy the TDC file to the Datasources folder in the My Tableau Repository. By default, the My Tableau Repository is located in C:\Users\<user>\Documents\My Tableau Repository.
 
-* For Tableau Desktop, save the file to the Datasources folder in the My Tableau Repository. By default, the My Tableau Repository is located in C:\Users\<user>\Documents\My Tableau Repository.
-* For Tableau Server, save the file to the C:\ProgramData\Tableau\Tableau Server\data\tabsvc\vizqlserver\Datasources directory.
 
 #### What's Next? Go to [Step 2. Configure ODBC Connections to Drill Data Sources]({{ site.baseurl }}/docs/configuring-connections-on-windows).


[44/50] [abbrv] drill git commit: diff workloads

Posted by ts...@apache.org.
diff workloads


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

Branch: refs/heads/gh-pages
Commit: 53a424ad617e2d04b8691f925372a4b6ab864c6f
Parents: 3249804
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Thu Apr 30 18:42:29 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Thu Apr 30 18:42:29 2015 -0700

----------------------------------------------------------------------
 _data/docs.json                                 | 300 +++++++++++++------
 _docs/manage-drill/011-configuring-memory.md    |  12 +-
 ...nfiguring-dfferent-workloads-introduction.md |   8 +-
 .../015-configuring-drill-in-a-cluster.md       |  59 ++--
 .../015-configuring-resources-in-a-cluster.md   |  78 +++++
 .../017-configuring-a-shared-drillbit.md        |   2 +-
 ...nfiguring-resources-for-a-shared-drillbit.md |  65 ++++
 7 files changed, 399 insertions(+), 125 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index 4efa490..6cc9b8d 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -766,8 +766,8 @@
             "next_title": "Configuration Options Introduction", 
             "next_url": "/docs/configuration-options-introduction/", 
             "parent": "Manage Drill", 
-            "previous_title": "Configuring a Shared Drillbit", 
-            "previous_url": "/docs/configuring-a-shared-drillbit/", 
+            "previous_title": "Configuring Resources for a Shared Drillbit", 
+            "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
             "relative_path": "_docs/manage-drill/020-configuration-options.md", 
             "title": "Configuration Options", 
             "url": "/docs/configuration-options/"
@@ -855,8 +855,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring Drill in a Cluster", 
-                    "next_url": "/docs/configuring-drill-in-a-cluster/", 
+                    "next_title": "Configuring Resources in a Cluster", 
+                    "next_url": "/docs/configuring-resources-in-a-cluster/", 
                     "parent": "Configuring Different Workloads", 
                     "previous_title": "Configuring Different Workloads", 
                     "previous_url": "/docs/configuring-different-workloads/", 
@@ -876,14 +876,56 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring a Shared Drillbit", 
-                    "next_url": "/docs/configuring-a-shared-drillbit/", 
+                    "next_title": "Configuring Resources in a Cluster", 
+                    "next_url": "/docs/configuring-resources-in-a-cluster/", 
                     "parent": "Configuring Different Workloads", 
                     "previous_title": "Configuring Different Workloads Introduction", 
                     "previous_url": "/docs/configuring-different-workloads-introduction/", 
                     "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md", 
-                    "title": "Configuring Drill in a Cluster", 
-                    "url": "/docs/configuring-drill-in-a-cluster/"
+                    "title": "Configuring Resources in a Cluster", 
+                    "url": "/docs/configuring-resources-in-a-cluster/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Configuring Different Workloads", 
+                            "url": "/docs/configuring-different-workloads/"
+                        }, 
+                        {
+                            "title": "Manage Drill", 
+                            "url": "/docs/manage-drill/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "Configuring Resources for a Shared Drillbit", 
+                    "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
+                    "parent": "Configuring Different Workloads", 
+                    "previous_title": "Configuring Resources in a Cluster", 
+                    "previous_url": "/docs/configuring-resources-in-a-cluster/", 
+                    "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md", 
+                    "title": "Configuring Resources in a Cluster", 
+                    "url": "/docs/configuring-resources-in-a-cluster/"
+                }, 
+                {
+                    "breadcrumbs": [
+                        {
+                            "title": "Configuring Different Workloads", 
+                            "url": "/docs/configuring-different-workloads/"
+                        }, 
+                        {
+                            "title": "Manage Drill", 
+                            "url": "/docs/manage-drill/"
+                        }
+                    ], 
+                    "children": [], 
+                    "next_title": "Configuring Resources for a Shared Drillbit", 
+                    "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
+                    "parent": "Configuring Different Workloads", 
+                    "previous_title": "Configuring Resources in a Cluster", 
+                    "previous_url": "/docs/configuring-resources-in-a-cluster/", 
+                    "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
+                    "title": "Configuring Resources for a Shared Drillbit", 
+                    "url": "/docs/configuring-resources-for-a-shared-drillbit/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -900,18 +942,18 @@
                     "next_title": "Configuration Options", 
                     "next_url": "/docs/configuration-options/", 
                     "parent": "Configuring Different Workloads", 
-                    "previous_title": "Configuring Drill in a Cluster", 
-                    "previous_url": "/docs/configuring-drill-in-a-cluster/", 
-                    "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
-                    "title": "Configuring a Shared Drillbit", 
-                    "url": "/docs/configuring-a-shared-drillbit/"
+                    "previous_title": "Configuring Resources for a Shared Drillbit", 
+                    "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
+                    "relative_path": "_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md", 
+                    "title": "Configuring Resources for a Shared Drillbit", 
+                    "url": "/docs/configuring-resources-for-a-shared-drillbit/"
                 }
             ], 
             "next_title": "Configuring Different Workloads Introduction", 
             "next_url": "/docs/configuring-different-workloads-introduction/", 
             "parent": "Manage Drill", 
-            "previous_title": "Configuring Memory for Drill", 
-            "previous_url": "/docs/configuring-memory-for-drill/", 
+            "previous_title": "Configuring Memory for Drill in a Drill cluster", 
+            "previous_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
             "relative_path": "_docs/manage-drill/012-configuring-different-workloads.md", 
             "title": "Configuring Different Workloads", 
             "url": "/docs/configuring-different-workloads/"
@@ -928,8 +970,8 @@
                 }
             ], 
             "children": [], 
-            "next_title": "Configuring Drill in a Cluster", 
-            "next_url": "/docs/configuring-drill-in-a-cluster/", 
+            "next_title": "Configuring Resources in a Cluster", 
+            "next_url": "/docs/configuring-resources-in-a-cluster/", 
             "parent": "Configuring Different Workloads", 
             "previous_title": "Configuring Different Workloads", 
             "previous_url": "/docs/configuring-different-workloads/", 
@@ -937,28 +979,7 @@
             "title": "Configuring Different Workloads Introduction", 
             "url": "/docs/configuring-different-workloads-introduction/"
         }, 
-        "Configuring Drill in a Cluster": {
-            "breadcrumbs": [
-                {
-                    "title": "Configuring Different Workloads", 
-                    "url": "/docs/configuring-different-workloads/"
-                }, 
-                {
-                    "title": "Manage Drill", 
-                    "url": "/docs/manage-drill/"
-                }
-            ], 
-            "children": [], 
-            "next_title": "Configuring a Shared Drillbit", 
-            "next_url": "/docs/configuring-a-shared-drillbit/", 
-            "parent": "Configuring Different Workloads", 
-            "previous_title": "Configuring Different Workloads Introduction", 
-            "previous_url": "/docs/configuring-different-workloads-introduction/", 
-            "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md", 
-            "title": "Configuring Drill in a Cluster", 
-            "url": "/docs/configuring-drill-in-a-cluster/"
-        }, 
-        "Configuring Memory for Drill": {
+        "Configuring Memory for Drill in a Drill cluster": {
             "breadcrumbs": [
                 {
                     "title": "Manage Drill", 
@@ -972,10 +993,10 @@
             "previous_title": "Manage Drill Introduction", 
             "previous_url": "/docs/manage-drill-introduction/", 
             "relative_path": "_docs/manage-drill/011-configuring-memory.md", 
-            "title": "Configuring Memory for Drill", 
-            "url": "/docs/configuring-memory-for-drill/"
+            "title": "Configuring Memory for Drill in a Drill cluster", 
+            "url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/"
         }, 
-        "Configuring a Shared Drillbit": {
+        "Configuring Resources for a Shared Drillbit": {
             "breadcrumbs": [
                 {
                     "title": "Configuring Different Workloads", 
@@ -990,11 +1011,32 @@
             "next_title": "Configuration Options", 
             "next_url": "/docs/configuration-options/", 
             "parent": "Configuring Different Workloads", 
-            "previous_title": "Configuring Drill in a Cluster", 
-            "previous_url": "/docs/configuring-drill-in-a-cluster/", 
-            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
-            "title": "Configuring a Shared Drillbit", 
-            "url": "/docs/configuring-a-shared-drillbit/"
+            "previous_title": "Configuring Resources for a Shared Drillbit", 
+            "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
+            "relative_path": "_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md", 
+            "title": "Configuring Resources for a Shared Drillbit", 
+            "url": "/docs/configuring-resources-for-a-shared-drillbit/"
+        }, 
+        "Configuring Resources in a Cluster": {
+            "breadcrumbs": [
+                {
+                    "title": "Configuring Different Workloads", 
+                    "url": "/docs/configuring-different-workloads/"
+                }, 
+                {
+                    "title": "Manage Drill", 
+                    "url": "/docs/manage-drill/"
+                }
+            ], 
+            "children": [], 
+            "next_title": "Configuring Resources for a Shared Drillbit", 
+            "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
+            "parent": "Configuring Different Workloads", 
+            "previous_title": "Configuring Resources in a Cluster", 
+            "previous_url": "/docs/configuring-resources-in-a-cluster/", 
+            "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md", 
+            "title": "Configuring Resources in a Cluster", 
+            "url": "/docs/configuring-resources-in-a-cluster/"
         }, 
         "Connect a Data Source": {
             "breadcrumbs": [], 
@@ -3458,8 +3500,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring Memory for Drill", 
-                    "next_url": "/docs/configuring-memory-for-drill/", 
+                    "next_title": "Configuring Memory for Drill in a Drill cluster", 
+                    "next_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
                     "parent": "Manage Drill", 
                     "previous_title": "Manage Drill", 
                     "previous_url": "/docs/manage-drill/", 
@@ -3481,8 +3523,8 @@
                     "previous_title": "Manage Drill Introduction", 
                     "previous_url": "/docs/manage-drill-introduction/", 
                     "relative_path": "_docs/manage-drill/011-configuring-memory.md", 
-                    "title": "Configuring Memory for Drill", 
-                    "url": "/docs/configuring-memory-for-drill/"
+                    "title": "Configuring Memory for Drill in a Drill cluster", 
+                    "url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -3504,8 +3546,8 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring Drill in a Cluster", 
-                            "next_url": "/docs/configuring-drill-in-a-cluster/", 
+                            "next_title": "Configuring Resources in a Cluster", 
+                            "next_url": "/docs/configuring-resources-in-a-cluster/", 
                             "parent": "Configuring Different Workloads", 
                             "previous_title": "Configuring Different Workloads", 
                             "previous_url": "/docs/configuring-different-workloads/", 
@@ -3525,14 +3567,56 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring a Shared Drillbit", 
-                            "next_url": "/docs/configuring-a-shared-drillbit/", 
+                            "next_title": "Configuring Resources in a Cluster", 
+                            "next_url": "/docs/configuring-resources-in-a-cluster/", 
                             "parent": "Configuring Different Workloads", 
                             "previous_title": "Configuring Different Workloads Introduction", 
                             "previous_url": "/docs/configuring-different-workloads-introduction/", 
                             "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md", 
-                            "title": "Configuring Drill in a Cluster", 
-                            "url": "/docs/configuring-drill-in-a-cluster/"
+                            "title": "Configuring Resources in a Cluster", 
+                            "url": "/docs/configuring-resources-in-a-cluster/"
+                        }, 
+                        {
+                            "breadcrumbs": [
+                                {
+                                    "title": "Configuring Different Workloads", 
+                                    "url": "/docs/configuring-different-workloads/"
+                                }, 
+                                {
+                                    "title": "Manage Drill", 
+                                    "url": "/docs/manage-drill/"
+                                }
+                            ], 
+                            "children": [], 
+                            "next_title": "Configuring Resources for a Shared Drillbit", 
+                            "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
+                            "parent": "Configuring Different Workloads", 
+                            "previous_title": "Configuring Resources in a Cluster", 
+                            "previous_url": "/docs/configuring-resources-in-a-cluster/", 
+                            "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md", 
+                            "title": "Configuring Resources in a Cluster", 
+                            "url": "/docs/configuring-resources-in-a-cluster/"
+                        }, 
+                        {
+                            "breadcrumbs": [
+                                {
+                                    "title": "Configuring Different Workloads", 
+                                    "url": "/docs/configuring-different-workloads/"
+                                }, 
+                                {
+                                    "title": "Manage Drill", 
+                                    "url": "/docs/manage-drill/"
+                                }
+                            ], 
+                            "children": [], 
+                            "next_title": "Configuring Resources for a Shared Drillbit", 
+                            "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
+                            "parent": "Configuring Different Workloads", 
+                            "previous_title": "Configuring Resources in a Cluster", 
+                            "previous_url": "/docs/configuring-resources-in-a-cluster/", 
+                            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
+                            "title": "Configuring Resources for a Shared Drillbit", 
+                            "url": "/docs/configuring-resources-for-a-shared-drillbit/"
                         }, 
                         {
                             "breadcrumbs": [
@@ -3549,18 +3633,18 @@
                             "next_title": "Configuration Options", 
                             "next_url": "/docs/configuration-options/", 
                             "parent": "Configuring Different Workloads", 
-                            "previous_title": "Configuring Drill in a Cluster", 
-                            "previous_url": "/docs/configuring-drill-in-a-cluster/", 
-                            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
-                            "title": "Configuring a Shared Drillbit", 
-                            "url": "/docs/configuring-a-shared-drillbit/"
+                            "previous_title": "Configuring Resources for a Shared Drillbit", 
+                            "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
+                            "relative_path": "_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md", 
+                            "title": "Configuring Resources for a Shared Drillbit", 
+                            "url": "/docs/configuring-resources-for-a-shared-drillbit/"
                         }
                     ], 
                     "next_title": "Configuring Different Workloads Introduction", 
                     "next_url": "/docs/configuring-different-workloads-introduction/", 
                     "parent": "Manage Drill", 
-                    "previous_title": "Configuring Memory for Drill", 
-                    "previous_url": "/docs/configuring-memory-for-drill/", 
+                    "previous_title": "Configuring Memory for Drill in a Drill cluster", 
+                    "previous_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
                     "relative_path": "_docs/manage-drill/012-configuring-different-workloads.md", 
                     "title": "Configuring Different Workloads", 
                     "url": "/docs/configuring-different-workloads/"
@@ -3661,8 +3745,8 @@
                     "next_title": "Configuration Options Introduction", 
                     "next_url": "/docs/configuration-options-introduction/", 
                     "parent": "Manage Drill", 
-                    "previous_title": "Configuring a Shared Drillbit", 
-                    "previous_url": "/docs/configuring-a-shared-drillbit/", 
+                    "previous_title": "Configuring Resources for a Shared Drillbit", 
+                    "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
                     "relative_path": "_docs/manage-drill/020-configuration-options.md", 
                     "title": "Configuration Options", 
                     "url": "/docs/configuration-options/"
@@ -3753,8 +3837,8 @@
                 }
             ], 
             "children": [], 
-            "next_title": "Configuring Memory for Drill", 
-            "next_url": "/docs/configuring-memory-for-drill/", 
+            "next_title": "Configuring Memory for Drill in a Drill cluster", 
+            "next_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
             "parent": "Manage Drill", 
             "previous_title": "Manage Drill", 
             "previous_url": "/docs/manage-drill/", 
@@ -10886,8 +10970,8 @@
                         }
                     ], 
                     "children": [], 
-                    "next_title": "Configuring Memory for Drill", 
-                    "next_url": "/docs/configuring-memory-for-drill/", 
+                    "next_title": "Configuring Memory for Drill in a Drill cluster", 
+                    "next_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
                     "parent": "Manage Drill", 
                     "previous_title": "Manage Drill", 
                     "previous_url": "/docs/manage-drill/", 
@@ -10909,8 +10993,8 @@
                     "previous_title": "Manage Drill Introduction", 
                     "previous_url": "/docs/manage-drill-introduction/", 
                     "relative_path": "_docs/manage-drill/011-configuring-memory.md", 
-                    "title": "Configuring Memory for Drill", 
-                    "url": "/docs/configuring-memory-for-drill/"
+                    "title": "Configuring Memory for Drill in a Drill cluster", 
+                    "url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/"
                 }, 
                 {
                     "breadcrumbs": [
@@ -10932,8 +11016,8 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring Drill in a Cluster", 
-                            "next_url": "/docs/configuring-drill-in-a-cluster/", 
+                            "next_title": "Configuring Resources in a Cluster", 
+                            "next_url": "/docs/configuring-resources-in-a-cluster/", 
                             "parent": "Configuring Different Workloads", 
                             "previous_title": "Configuring Different Workloads", 
                             "previous_url": "/docs/configuring-different-workloads/", 
@@ -10953,14 +11037,56 @@
                                 }
                             ], 
                             "children": [], 
-                            "next_title": "Configuring a Shared Drillbit", 
-                            "next_url": "/docs/configuring-a-shared-drillbit/", 
+                            "next_title": "Configuring Resources in a Cluster", 
+                            "next_url": "/docs/configuring-resources-in-a-cluster/", 
                             "parent": "Configuring Different Workloads", 
                             "previous_title": "Configuring Different Workloads Introduction", 
                             "previous_url": "/docs/configuring-different-workloads-introduction/", 
                             "relative_path": "_docs/manage-drill/015-configuring-drill-in-a-cluster.md", 
-                            "title": "Configuring Drill in a Cluster", 
-                            "url": "/docs/configuring-drill-in-a-cluster/"
+                            "title": "Configuring Resources in a Cluster", 
+                            "url": "/docs/configuring-resources-in-a-cluster/"
+                        }, 
+                        {
+                            "breadcrumbs": [
+                                {
+                                    "title": "Configuring Different Workloads", 
+                                    "url": "/docs/configuring-different-workloads/"
+                                }, 
+                                {
+                                    "title": "Manage Drill", 
+                                    "url": "/docs/manage-drill/"
+                                }
+                            ], 
+                            "children": [], 
+                            "next_title": "Configuring Resources for a Shared Drillbit", 
+                            "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
+                            "parent": "Configuring Different Workloads", 
+                            "previous_title": "Configuring Resources in a Cluster", 
+                            "previous_url": "/docs/configuring-resources-in-a-cluster/", 
+                            "relative_path": "_docs/manage-drill/015-configuring-resources-in-a-cluster.md", 
+                            "title": "Configuring Resources in a Cluster", 
+                            "url": "/docs/configuring-resources-in-a-cluster/"
+                        }, 
+                        {
+                            "breadcrumbs": [
+                                {
+                                    "title": "Configuring Different Workloads", 
+                                    "url": "/docs/configuring-different-workloads/"
+                                }, 
+                                {
+                                    "title": "Manage Drill", 
+                                    "url": "/docs/manage-drill/"
+                                }
+                            ], 
+                            "children": [], 
+                            "next_title": "Configuring Resources for a Shared Drillbit", 
+                            "next_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
+                            "parent": "Configuring Different Workloads", 
+                            "previous_title": "Configuring Resources in a Cluster", 
+                            "previous_url": "/docs/configuring-resources-in-a-cluster/", 
+                            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
+                            "title": "Configuring Resources for a Shared Drillbit", 
+                            "url": "/docs/configuring-resources-for-a-shared-drillbit/"
                         }, 
                         {
                             "breadcrumbs": [
@@ -10977,18 +11103,18 @@
                             "next_title": "Configuration Options", 
                             "next_url": "/docs/configuration-options/", 
                             "parent": "Configuring Different Workloads", 
-                            "previous_title": "Configuring Drill in a Cluster", 
-                            "previous_url": "/docs/configuring-drill-in-a-cluster/", 
-                            "relative_path": "_docs/manage-drill/017-configuring-a-shared-drillbit.md", 
-                            "title": "Configuring a Shared Drillbit", 
-                            "url": "/docs/configuring-a-shared-drillbit/"
+                            "previous_title": "Configuring Resources for a Shared Drillbit", 
+                            "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
+                            "relative_path": "_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md", 
+                            "title": "Configuring Resources for a Shared Drillbit", 
+                            "url": "/docs/configuring-resources-for-a-shared-drillbit/"
                         }
                     ], 
                     "next_title": "Configuring Different Workloads Introduction", 
                     "next_url": "/docs/configuring-different-workloads-introduction/", 
                     "parent": "Manage Drill", 
-                    "previous_title": "Configuring Memory for Drill", 
-                    "previous_url": "/docs/configuring-memory-for-drill/", 
+                    "previous_title": "Configuring Memory for Drill in a Drill cluster", 
+                    "previous_url": "/docs/configuring-memory-for-drill-in-a-drill-cluster/", 
                     "relative_path": "_docs/manage-drill/012-configuring-different-workloads.md", 
                     "title": "Configuring Different Workloads", 
                     "url": "/docs/configuring-different-workloads/"
@@ -11089,8 +11215,8 @@
                     "next_title": "Configuration Options Introduction", 
                     "next_url": "/docs/configuration-options-introduction/", 
                     "parent": "Manage Drill", 
-                    "previous_title": "Configuring a Shared Drillbit", 
-                    "previous_url": "/docs/configuring-a-shared-drillbit/", 
+                    "previous_title": "Configuring Resources for a Shared Drillbit", 
+                    "previous_url": "/docs/configuring-resources-for-a-shared-drillbit/", 
                     "relative_path": "_docs/manage-drill/020-configuration-options.md", 
                     "title": "Configuration Options", 
                     "url": "/docs/configuration-options/"

http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_docs/manage-drill/011-configuring-memory.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/011-configuring-memory.md b/_docs/manage-drill/011-configuring-memory.md
index 68c2bf0..f1921d3 100644
--- a/_docs/manage-drill/011-configuring-memory.md
+++ b/_docs/manage-drill/011-configuring-memory.md
@@ -1,10 +1,11 @@
 ---
-title: "Configuring Memory for Drill"
+title: "Configuring Memory for Drill in a Drill cluster"
 parent: "Manage Drill"
 ---
 
-You can configure the amount of direct memory allocated to a Drillbit for
-query processing. The default limit is 8G, but Drill prefers 16G or more
+This section describes how to configure the amount of direct memory allocated to a Drillbit for query processing in a dedicated Drill cluster. When you use Drill in a cluster with other workloads, configure memory as described in section, ["Configuring Resources in a Cluster"]({{site.baseurl}}/docs/configuring-resources-in-a-cluster). 
+
+The default memory for a Drillbit is 8G, but Drill prefers 16G or more
 depending on the workload. The total amount of direct memory that a Drillbit
 allocates to query operations cannot exceed the limit set.
 
@@ -26,7 +27,4 @@ env.sh`.
 
 {% include startnote.html %}If this parameter is not set, the limit depends on the amount of available system memory.{% include endnote.html %}
 
-After you edit `<drill_installation_directory>/conf/drill-env.sh`, [restart
-the Drillbit
-]({{ site.baseurl }}/docs/starting-stopping-drill#starting-a-drillbit)on
-the node.
\ No newline at end of file
+After you edit `<drill_installation_directory>/conf/drill-env.sh`, [restart the Drillbit]({{ site.baseurl }}/docs/starting-stopping-drill#starting-a-drillbit) onthe node.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
index 29b830c..ce1f1a6 100644
--- a/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
+++ b/_docs/manage-drill/013-configuring-dfferent-workloads-introduction.md
@@ -3,7 +3,7 @@ title: "Configuring Different Workloads Introduction"
 parent: "Configuring Different Workloads"
 ---
 
-Drill supports multiple users sharing a drillbit. You can also run separate drillbits running on different nodes in the cluster.
+Drill supports multiple users sharing a Drillbit. You can also run separate Drillbits running on different nodes in the cluster.
 
 Drill typically runs along side other workloads, including the following:  
 
@@ -15,8 +15,8 @@ Drill typically runs along side other workloads, including the following:
 
 You need to plan and configure these resources for use with Drill and other workloads: 
 
-* [Memory]({{site.baseurl}}/docs/configuring-memory)  
-* [CPU]({{site.baseurl}}/docs/how-to-manage-drill-cpu-resources)  
+* [Memory]({{site.baseurl}}/docs/configuring-resources-in-a-cluster)  
+* [CPU]({{site.baseurl}}/docs/configuring-drill-in-a-cluster#how-to-manage-drill-cpu-resources)  
 * Disk  
 
-["How to Run Drill in a Cluster"]({{site.baseurl}}/docs/how-to-run-drill-in-a-cluster) covers configuration for sharing a drillbit and ["How Multiple Users Share a Drillbit"]({{site.baseurl}}/docs/how-multiple-users-share-a-drillbit) covers configuration for drillbits running on different nodes in the cluster.
\ No newline at end of file
+["How to Run Drill in a Cluster"]({{site.baseurl}}/docs/how-to-run-drill-in-a-cluster) covers configuration for sharing a drillbit and ["How Multiple Users Share a Drillbit"]({{site.baseurl}}/docs/how-multiple-users-share-a-drillbit) covers configuration for Drillbits running on different nodes in the cluster.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
index 11e4747..4ec1cf4 100644
--- a/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
+++ b/_docs/manage-drill/015-configuring-drill-in-a-cluster.md
@@ -1,62 +1,69 @@
 ---
-title: "Configuring Drill in a Cluster"
+title: "Configuring Resources in a Cluster"
 parent: "Configuring Different Workloads"
 ---
 Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designate which partition handles which workload. 
 
-To reserve memory resources for Drill, you modify the `warden.drill-bits.conf` file in `/opt/mapr/conf/conf.d`. This file is created automatically when you install Drill on a node. 
+## Configuring Drill Memory in a Cluster with other Workloads
+
+To configure memory resources for Drill, you modify the `warden.drill-bits.conf` file in `/opt/mapr/conf/conf.d`. This file is created automatically when you install Drill on a node. 
 
     [root@centos23 conf.d]# pwd
     /opt/mapr/conf/conf.d
     [root@centos23 conf.d]# ls
     warden.drill-bits.conf  warden.nodemanager.conf  warden.resourcemanager.conf
 
-You add the following lines to the file:
+You add the following lines to the wardens.drill-bits.conf file to configure memory resources for Drill:
 
     service.heapsize.min=<some value in MB>
     service.heapsize.max=<some value in MB>
-    service.heapsize.percent=<some whole number value>
+    service.heapsize.percent=<a whole number>
+
+This service.heapsize.percent is the percentage of memory for the service bounded by min and max values.
 
 ## Configuring Drill in a YARN-enabled MapR Cluster
 
-For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
+To add Drill to a YARN-enabled cluster, you change memory resources depending on your application. For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
 
 File system = 20G  
 HBase = 20G  
 Yarn = 20G  
 OS = 8G  
 
-To add Drill to the cluster, how do you change memory allocation? It depends on your application. If Yarn does most of the work, give Drill 20G, for example, and give Yarn 60G. If you expect a heavy query load, give Drill 60G and Drill 20G.
+If Yarn does most of the work, give Drill 20G, for example, and give Yarn 60G. If you expect a heavy query load, give Drill 60G and Drill 20G.
 
 {% include startnote.html %}Drill will execute queries within Yarn soon.{% include endnote.html %} [DRILL-142](https://issues.apache.org/jira/browse/DRILL-142)
 
-<!-- YARN consists of 2 main services ResourceManager(one instance in cluster, more if HA is configured) and NodeManager(one instance per node). See mr1.memory.percent, mr1.cpu.percent and 
-mr1.disk.percent in warden.conf. Rest is given to YARN applications.
-Also see /opt/mapr/conf/conf.d/warden.resourcemanager.conf and
- /opt/mapr/conf/conf.d/warden.nodemanager.conf for resources given to ResourceManager and NodeManager respectively.
+YARN consists of two main services:
+
+* ResourceManager  
+  There is at least one instance in a cluster, more if you configure high availability.  
+* NodeManager  
+  There is one instance per node. 
+
+Configure ResourceManager and NodeManager memory in `/opt/mapr/conf/conf.d/warden.resourcemanager.conf` and
+ `/opt/mapr/conf/conf.d/warden.nodemanager.conf`. Configure the following warden.nodemanager.conf settings. The defaults are:
+
+    service.heapsize.min=64
+    service.heapsize.max=325
+    service.heapsize.percent=2
+
+Memory allocation for NodeManager and ResourceManager is used only to calculate total memory required for all services to run. The -Xmx option is not set, allowing memory on to grow as needed. If you want to place an upper limit on memory set YARN_NODEMANAGER_HEAPSIZE or YARN_RESOURCEMANAGER_HEAPSIZE environment variable in /opt/mapr/hadoop/hadoop-2.5.1/etc/hadoop/yarn-env.sh.
 
-## Configuring Drill in a MapReduce V1-enabled cluster
+### MapReduce v1 Resources
 
-Similar files exist for other installed services, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf). For example:
-## What are the memory/resource configurations set in warden in a non-YARN cluster? 
+To configure memory for MapReduce v1 resources set mr1.memory.percent, mr1.cpu.percent and mr1.disk.percent in warden.conf, as described in section ["Resource Allocation for Jobs and Applications"](http://doc.mapr.com/display/MapR/Resource+Allocation+for+Jobs+and+Applications) of the MapR documentation. Remaining memory is given to YARN applications. 
 
-Every service will have 3 values defined in warden.conf (/opt/mapr/conf)
-service.command.<servicename>.heapsize.percent
-service.command.<servicename>.heapsize.max
-service.command.<servicename>.heapsize.min
-This is percentage of memory for that service bounded by min and max values.
 
-There will also be additional files in /opt/mapr/conf/conf.d in format 
-warden.<servicename>.conf. They will have entries like
-service.heapsize.min
-service.heapsize.max
-service.heapsize.percent -->
+### MapReduce v2 and other Resources
 
-## Managing Memory
+Similar files exist for other installed services, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf). 
 
-To run Drill in a cluster with MapReduce, HBase, Spark, and other workloads, manage memory according to your application needs. 
+You configure memory for each service by setting three values in `warden.conf`.
 
-To run Drill in a MapR cluster, allocate memory by configuring settings in warden.conf, as described in the [MapR documentation]().
+    service.command.<servicename>.heapsize.percent
+    service.command.<servicename>.heapsize.max
+    service.command.<servicename>.heapsize.min
 
 ### Drill Memory
 You can configure the amount of direct memory allocated to a Drillbit for

http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_docs/manage-drill/015-configuring-resources-in-a-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/015-configuring-resources-in-a-cluster.md b/_docs/manage-drill/015-configuring-resources-in-a-cluster.md
new file mode 100644
index 0000000..7995278
--- /dev/null
+++ b/_docs/manage-drill/015-configuring-resources-in-a-cluster.md
@@ -0,0 +1,78 @@
+---
+title: "Configuring Resources in a Cluster"
+parent: "Configuring Different Workloads"
+---
+Drill operations are memory and CPU-intensive. You need to statically partition the cluster to designate which partition handles which workload. 
+
+To reserve memory resources for Drill, you modify the `warden.drill-bits.conf` file in `/opt/mapr/conf/conf.d`. This file is created automatically when you install Drill on a node. 
+
+    [root@centos23 conf.d]# pwd
+    /opt/mapr/conf/conf.d
+    [root@centos23 conf.d]# ls
+    warden.drill-bits.conf  warden.nodemanager.conf  warden.resourcemanager.conf
+
+You add the following lines to the file:
+
+    service.heapsize.min=<some value in MB>
+    service.heapsize.max=<some value in MB>
+    service.heapsize.percent=<some whole number value>
+
+## Configuring Drill in a YARN-enabled MapR Cluster
+
+For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:
+
+File system = 20G  
+HBase = 20G  
+Yarn = 20G  
+OS = 8G  
+
+To add Drill to the cluster, how do you change memory allocation? It depends on your application. If Yarn does most of the work, give Drill 20G, for example, and give Yarn 60G. If you expect a heavy query load, give Drill 60G and Drill 20G.
+
+{% include startnote.html %}Drill will execute queries within Yarn soon.{% include endnote.html %} [DRILL-142](https://issues.apache.org/jira/browse/DRILL-142)
+
+<!-- YARN consists of 2 main services ResourceManager(one instance in cluster, more if HA is configured) and NodeManager(one instance per node). See mr1.memory.percent, mr1.cpu.percent and 
+mr1.disk.percent in warden.conf. Rest is given to YARN applications.
+Also see /opt/mapr/conf/conf.d/warden.resourcemanager.conf and
+ /opt/mapr/conf/conf.d/warden.nodemanager.conf for resources given to ResourceManager and NodeManager respectively.
+
+## Configuring Drill in a MapReduce V1-enabled cluster
+
+Similar files exist for other installed services, as described in [MapR documentation](http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf). For example:
+## What are the memory/resource configurations set in warden in a non-YARN cluster? 
+
+Every service will have 3 values defined in warden.conf (/opt/mapr/conf)
+service.command.<servicename>.heapsize.percent
+service.command.<servicename>.heapsize.max
+service.command.<servicename>.heapsize.min
+This is percentage of memory for that service bounded by min and max values.
+
+There will also be additional files in /opt/mapr/conf/conf.d in format 
+warden.<servicename>.conf. They will have entries like
+service.heapsize.min
+service.heapsize.max
+service.heapsize.percent -->
+
+## Managing Memory
+
+To run Drill in a cluster with MapReduce, HBase, Spark, and other workloads, manage memory according to your application needs. 
+
+To run Drill in a MapR cluster, allocate memory by configuring settings in warden.conf, as described in the [MapR documentation]().
+
+### Drill Memory
+You can configure the amount of direct memory allocated to a Drillbit for
+query processing, as described in the section, ["Configuring Memory"](({{site.baseurl}}/docs/configuring-memory).
+
+### Memory in a MapR Cluster
+Memory and disk for Drill and other services that are not associated with roles on a MapR cluster are shared with other services. You manage the chunk of memory for these services in os heap settings in `warden.conf` and in configuration files of the particular service. The warden os heap settings are:
+
+    service.command.os.heapsize.percent
+    service.command.os.heapsize.max
+    service.command.os.heapsize.min
+
+For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:
+* [Memory Allocation for Nodes](http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes)
+* [Cluster Resource Allocation](http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation)
+* [Customizing Memory Settings for MapReduce v1](http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1)
+
+## How to Manage Drill CPU Resources
+Currently, you do not manage CPU resources within Drill. [Use Linux `cgroups`](http://en.wikipedia.org/wiki/Cgroups) to manage the CPU resources.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_docs/manage-drill/017-configuring-a-shared-drillbit.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/017-configuring-a-shared-drillbit.md b/_docs/manage-drill/017-configuring-a-shared-drillbit.md
index 0466d3b..7ffe0b7 100644
--- a/_docs/manage-drill/017-configuring-a-shared-drillbit.md
+++ b/_docs/manage-drill/017-configuring-a-shared-drillbit.md
@@ -1,5 +1,5 @@
 ---
-title: "Configuring a Shared Drillbit"
+title: "Configuring Resources for a Shared Drillbit"
 parent: "Configuring Different Workloads"
 ---
 To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization.

http://git-wip-us.apache.org/repos/asf/drill/blob/53a424ad/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md b/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md
new file mode 100644
index 0000000..7ffe0b7
--- /dev/null
+++ b/_docs/manage-drill/017-configuring-resources-for-a-shared-drillbit.md
@@ -0,0 +1,65 @@
+---
+title: "Configuring Resources for a Shared Drillbit"
+parent: "Configuring Different Workloads"
+---
+To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization.
+
+##Configuring Drill Query Queuing
+
+Set [options in sys.options]({{site.baseurl}}/docs/configuration-options-introduction/) to enable and manage query queuing, which is turned off by default. There are two types of queues: large and small. You configure a maximum number of queries that each queue allows by configuring the following options in the `sys.options` table:
+
+* exec.queue.large  
+* exec.queue.small  
+
+### Example Configuration
+
+For example, you configure the queue reserved for large queries to hold a 5-query maximum. You configure the queue reserved for small queries to hold 20 queries. Users start to run queries, and Drill receives the following query requests in this order:
+
+* Query A (blue): 1 billion records, Drill estimates 10 million rows will be processed  
+* Query B (red): 2 billion records, Drill estimates 20 million rows will be processed  
+* Query C: 1 billion records  
+* Query D: 100 records
+
+The exec.queue.threshold default is 30 million, which is the estimated rows to be processed by the query. Queries A and B are queued in the large queue. The estimated rows to be processed reaches the 30 million threshold, filling the queue to capacity. The query C request arrives and goes on the wait list, and then query D arrives. Query D is queued immediately in the small queue because of its small size, as shown in the following diagram: 
+
+![drill queuing]({{ site.baseurl }}/docs/img/queuing.png)
+
+The Drill queuing configuration in this example tends to give many users running small queries a rapid response. Users running a large query might experience some delay until an earlier-received large query returns, freeing space in the large queue to process queries that are waiting.
+
+## Controlling Parallelization
+
+By default, Drill parallelizes operations when number of records manipulated within a fragment reaches 100,000. When parallelization of operations is high, the cluster operates as fast as possible, which is fine for a single user. In a contentious multi-tenant situation, however, you need to reduce parallelization to levels based on user needs.
+
+### Parallelization Configuration Procedure
+
+To configure parallelization, configure the following options in the `sys.options` table:
+
+* `planner.width.max.per.node`  
+  The maximum degree of distribution of a query across cores and cluster nodes.
+* `planner.width.max.per.query`  
+  Same as max per node but applies to the query as executed by the entire cluster.
+
+Configure the `planner.width.max.per.node` to achieve fine grained, absolute control over parallelization. 
+
+<!-- ??For example, setting the `planner.width.max.per.query` to 60 will not accelerate Drill operations because overlapping does not occur when executing 60 queries at the same time.??
+
+### Example of Configuring Parallelization
+
+For example, the default settings parallelize 70 percent of operations up to 1,000 cores. If you have 30 cores per node in a 10-node cluster, or 300 cores, parallelization occurs on approximately 210 cores. Consequently, a single user can get 70 percent usage from a cluster and no more due to the constraints configured by the `planner.width.max.per.query`.
+
+A parallelizer in the Foreman transforms the physical plan into multiple phases. A complicated query can have multiple, major fragments. A default parallelization of 70 percent of operations allows some overlap of query phases. In the example, 210 ??for each core or major fragment to a maximum of 410??.
+
+??Drill uses pipelines, blocking/nonblocking, memory is not fungible. CPU resources are fungible. There is contention for CPUs.?? -->
+
+## Data Isolation
+
+Tenants can share data on a cluster using Drill views and impersonation. ??Link to impersonation doc.??
+
+
+
+
+
+
+
+
+


[37/50] [abbrv] drill git commit: Merge branch 'gh-pages' of https://github.com/tshiran/drill into gh-pages

Posted by ts...@apache.org.
Merge branch 'gh-pages' of https://github.com/tshiran/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/d26819ab
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/d26819ab
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/d26819ab

Branch: refs/heads/gh-pages
Commit: d26819ab727c9b6d939c7a5b6b07a39cd8782faa
Parents: c4a4fd1 3f4d05b
Author: Tomer Shiran <ts...@gmail.com>
Authored: Thu Apr 30 16:42:36 2015 -0700
Committer: Tomer Shiran <ts...@gmail.com>
Committed: Thu Apr 30 16:42:36 2015 -0700

----------------------------------------------------------------------
 _data/docs.json                                 | 75 ++++++++++++++++----
 .../010-manage-drill-introduction.md            |  9 +--
 _docs/manage-drill/011-configuring-memory.md    | 32 +++++++++
 ...-multi-instance-architecture-introduction.md |  2 +-
 .../015-how-to-run-drill-in-a-cluster.md        | 20 +-----
 .../010-configuration-options-introduction.md   | 29 --------
 .../data-types/010-supported-data-types.md      | 13 ++--
 7 files changed, 105 insertions(+), 75 deletions(-)
----------------------------------------------------------------------