drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tshi...@apache.org
Subject [5/7] drill git commit: html > markdown
Date Tue, 05 May 2015 18:32:08 GMT
html > markdown


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

Branch: refs/heads/gh-pages
Commit: 04ed3f56e03da191d11540853e723308448cc6ee
Parents: 288ac7d
Author: Kristine Hahn <khahn@maprtech.com>
Authored: Tue May 5 07:31:20 2015 -0700
Committer: Kristine Hahn <khahn@maprtech.com>
Committed: Tue May 5 07:31:20 2015 -0700

----------------------------------------------------------------------
 .../020-hive-to-drill-data-type-mapping.md      | 106 +----
 .../040-parquet-format.md                       | 159 +------
 .../050-json-data-model.md                      |  33 +-
 .../060-custom-function-interfaces.md           |  42 +-
 _docs/getting-started/010-drill-introduction.md |  29 +-
 .../047-installing-drill-on-the-cluster.md      |   2 +-
 _docs/manage-drill/040-ports-used-by-drill.md   |   8 +-
 .../040-persistent-configuration-storage.md     |   5 +-
 _docs/odbc-jdbc-interfaces/020-using-jdbc.md    |   8 +-
 .../010-installing-the-driver-on-linux.md       |   2 +-
 .../040-driver-configuration-options.md         |  12 +-
 .../060-advanced-properties.md                  |   8 +-
 .../030-connecting-to-data-sources.md           |   5 +-
 _docs/sql-reference/090-sql-extensions.md       |  33 +-
 .../data-types/010-supported-data-types.md      | 472 +++----------------
 .../sql-functions/010-math-and-trig.md          | 159 ++-----
 .../sql-functions/020-data-type-conversion.md   | 235 ++-------
 .../030-date-time-functions-and-arithmetic.md   |  98 ++--
 18 files changed, 327 insertions(+), 1089 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/data-sources-and-file-formats/020-hive-to-drill-data-type-mapping.md
----------------------------------------------------------------------
diff --git a/_docs/data-sources-and-file-formats/020-hive-to-drill-data-type-mapping.md b/_docs/data-sources-and-file-formats/020-hive-to-drill-data-type-mapping.md
index 5f438d2..ed66a7a 100644
--- a/_docs/data-sources-and-file-formats/020-hive-to-drill-data-type-mapping.md
+++ b/_docs/data-sources-and-file-formats/020-hive-to-drill-data-type-mapping.md
@@ -6,94 +6,24 @@ Using Drill you can read tables created in Hive that use data types compatible w
 
 <!-- See DRILL-1570 -->
 
-<table>
-  <tr>
-    <th>Supported SQL Type</th>
-    <th>Hive Type</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>BIGINT</td>
-    <td>BIGINT</td>
-    <td>8-byte signed integer</td>
-  </tr>
-  <tr>
-    <td>BOOLEAN</td>
-    <td>BOOLEAN</td>
-    <td>TRUE (1) or FALSE (0)</td>
-  </tr>
-  <tr>
-    <td>CHAR</td>
-    <td>CHAR</td>
-    <td>Character string, fixed-length max 255</td>
-  </tr>
-  <tr>
-    <td>DATE</td>
-    <td>DATE</td>
-    <td>Years months and days in the form in the form YYYY-­MM-­DD</td>
-  </tr>
-  <tr>
-    <td>DECIMAL</td>
-    <td>DECIMAL</td>
-    <td>38-digit precision</td>
-  </tr>
-  <tr>
-    <td>FLOAT</td>
-    <td>FLOAT</td>
-    <td>4-byte single precision floating point number</td>
-  </tr>
-  <tr>
-    <td>DOUBLE</td>
-    <td>DOUBLE</td>
-    <td>8-byte double precision floating point number</td>
-  </tr>
-  <tr>
-    <td>INT or INTEGER</td>
-    <td>INT</td>
-    <td>4-byte signed integer</td>
-  </tr>
-  <tr>
-    <td>INTERVALDAY</td>
-    <td>N/A</td>
-    <td>Integer fields representing a day</td>
-  </tr>
-  <tr>
-    <td>INTERVALYEAR</td>
-    <td>N/A</td>
-    <td>Integer fields representing a year</td>
-  </tr>
-  <tr>
-    <td>SMALLINT</td>
-    <td>SMALLINT</td>
-    <td>2-byte signed integer</td>
-  </tr>
-  <tr>
-    <td>TIME</td>
-    <td>N/A</td>
-    <td>Hours minutes seconds 24-hour basis</td>
-  </tr>
-  <tr>
-    <td>N/A</td>
-    <td>TIMESTAMP</td>
-    <td>Conventional UNIX Epoch timestamp.</td>
-  </tr>
-  <tr>
-    <td>TIMESTAMP</td>
-    <td>TIMESTAMP</td>
-    <td>JDBC timestamp in yyyy-mm-dd hh:mm:ss format</td>
-  </tr>
-  <tr>
-    <td>None</td>
-    <td>STRING</td>
-    <td>Binary string (16)</td>
-  </tr>
-  
-  <tr>
-    <td>VARCHAR</td>
-    <td>VARCHAR</td>
-    <td>Character string variable length</td>
-  </tr>
-</table>
+| Supported SQL Type | Hive Type | Description                                                |
+|--------------------|-----------|------------------------------------------------------------|
+| BIGINT             | BIGINT    | 8-byte signed integer                                      |
+| BOOLEAN            | BOOLEAN   | TRUE (1) or FALSE (0)                                      |
+| CHAR               | CHAR      | Character string, fixed-length max 255                     |
+| DATE               | DATE      | Years months and days in the form in the form YYYY-­MM-­DD |
+| DECIMAL            | DECIMAL   | 38-digit precision                                         |
+| FLOAT              | FLOAT     | 4-byte single precision floating point number              |
+| DOUBLE             | DOUBLE    | 8-byte double precision floating point number              |
+| INT or INTEGER     | INT       | 4-byte signed integer                                      |
+| INTERVALDAY        | N/A       | Integer fields representing a day                          |
+| INTERVALYEAR       | N/A       | Integer fields representing a year                         |
+| SMALLINT           | SMALLINT  | 2-byte signed integer                                      |
+| TIME               | N/A       | Hours minutes seconds 24-hour basis                        |
+| N/A                | TIMESTAMP | Conventional UNIX Epoch timestamp.                         |
+| TIMESTAMP          | TIMESTAMP | JDBC timestamp in yyyy-mm-dd hh:mm:ss format               |
+| None               | STRING    | Binary string (16)                                         |
+| VARCHAR            | VARCHAR   | Character string variable length                           |
 
 ## Unsupported Types
 Drill does not support the following Hive types:

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/data-sources-and-file-formats/040-parquet-format.md
----------------------------------------------------------------------
diff --git a/_docs/data-sources-and-file-formats/040-parquet-format.md b/_docs/data-sources-and-file-formats/040-parquet-format.md
index 04863f6..55c4e68 100644
--- a/_docs/data-sources-and-file-formats/040-parquet-format.md
+++ b/_docs/data-sources-and-file-formats/040-parquet-format.md
@@ -119,144 +119,35 @@ For more examples of and information about using Parquet data, see ["Evolving Pa
 ### SQL Data Types to Parquet
 The first table in this section maps SQL data types to Parquet data types, limited intentionally by Parquet creators to minimize the impact on disk storage:
 
-<table>
-  <tr>
-    <th>SQL Type</th>
-    <th>Parquet Type</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>BIGINT</td>
-    <td>INT64</td>
-    <td>8-byte signed integer</td>
-  </tr>
-  <tr>
-    <td>BOOLEAN</td>
-    <td>BOOLEAN</td>
-    <td>TRUE (1) or FALSE (0)</td>
-  </tr>
-  <tr>
-    <td>N/A</td>
-    <td>BYTE_ARRAY</td>
-    <td>Arbitrarily long byte array</td>
-  </tr>
-  <tr>
-    <td>FLOAT</td>
-    <td>FLOAT</td>
-    <td>4-byte single precision floating point number</td>
-  </tr>
-  <tr>
-    <td>DOUBLE</td>
-    <td>DOUBLE</td>
-    <td>8-byte double precision floating point number</td>
-  </tr>
-  <tr>
-    <td>INTEGER</td>
-    <td>INT32</td>
-    <td>4-byte signed integer</td>
-  </tr>
-  <tr>
-    <td>None</td>
-    <td>INT96</td>
-    <td>12-byte signed int</td>
-  </tr>
-</table>
+| SQL Type | Parquet Type | Description                                   |
+|----------|--------------|-----------------------------------------------|
+| BIGINT   | INT64        | 8-byte signed integer                         |
+| BOOLEAN  | BOOLEAN      | TRUE (1) or FALSE (0)                         |
+| N/A      | BYTE_ARRAY   | Arbitrarily long byte array                   |
+| FLOAT    | FLOAT        | 4-byte single precision floating point number |
+| DOUBLE   | DOUBLE       | 8-byte double precision floating point number |
+| INTEGER  | INT32        | 4-byte signed integer                         |
+| None     | INT96        | 12-byte signed int                            |
 
 ### SQL Types to Parquet Logical Types
 Parquet also supports logical types, fully described on the [Apache Parquet site](https://github.com/Parquet/parquet-format/blob/master/LogicalTypes.md). Embedded types, JSON and BSON, annotate a binary primitive type representing a JSON or BSON document. The logical types and their mapping to SQL types are:
  
-<table>
-  <tr>
-    <th>SQL Type</th>
-    <th>Drill Description</th>
-    <th>Parquet Logical Type</th>
-    <th>Parquet Description</th>
-  </tr>
-  <tr>
-    <td>DATE</td>
-    <td>Years months and days in the form in the form YYYY-­MM-­DD</td>
-    <td>DATE</td>
-    <td>Date, not including time of day. Uses the int32 annotation. Stores the number of days from the Unix epoch, 1 January 1970.</td>
-  </tr>
-  <tr>
-    <td>VARCHAR</td>
-    <td>Character string variable length</td>
-    <td>UTF8 (Strings)</td>
-    <td>Annotates the binary primitive type. The byte array is interpreted as a UTF-8 encoded character string.</td>
-  </tr>
-  <tr>
-    <td>None</td>
-    <td></td>
-    <td>INT_8</td>
-    <td>8 bits, signed</td>
-  </tr>
-  <tr>
-    <td>None</td>
-    <td></td>
-    <td>INT_16</td>
-    <td>16 bits, usigned</td>
-  </tr>
-  <tr>
-    <td>INT</td>
-    <td>4-byte signed integer</td>
-    <td>INT_32</td>
-    <td>32 bits, signed</td>
-  </tr>
-  <tr>
-    <td>DOUBLE</td>
-    <td>8-byte double precision floating point number</td>
-    <td>INT_64</td>
-    <td>64 bits, signed</td>
-  </tr>
-  <tr>
-    <td>None</td>
-    <td></td>
-    <td>UINT_8</td>
-    <td>8 bits, unsigned</td>
-  </tr>
-  <tr>
-    <td>None</td>
-    <td></td>
-    <td>UINT_16</td>
-    <td>16 bits, unsigned</td>
-  </tr>
-  <tr>
-    <td>None</td>
-    <td></td>
-    <td>UINT_32</td>
-    <td>32 bits, unsigned</td>
-  </tr>
-  <tr>
-    <td>None</td>
-    <td></td>
-    <td>UINT_64</td>
-    <td>64 bits, unsigned</td>
-  </tr>
-  <tr>
-    <td>DECIMAL</td>
-    <td>38-digit precision</td>
-    <td>DECIMAL</td>
-    <td>Arbitrary-precision signed decimal numbers of the form unscaledValue * 10^(-scale)</td>
-  </tr>
-  <tr>
-    <td>TIME</td>
-    <td>Hours, minutes, seconds, milliseconds; 24-hour basis</td>
-    <td>TIME_MILLIS</td>
-    <td>Logical time, not including the date. Annotates int32. Number of milliseconds after midnight.</td>
-  </tr>
-  <tr>
-    <td>TIMESTAMP</td>
-    <td>Year, month, day, and seconds</td>
-    <td>TIMESTAMP_MILLIS</td>
-    <td>Logical date and time. Annotates an int64 that stores the number of milliseconds from the Unix epoch, 00:00:00.000 on 1 January 1970, UTC.</td>
-  </tr>
-  <tr>
-    <td>INTERVALDAY and INTERVALYEAR</td>
-    <td>Integer fields representing a period of time depending on the type of interval</td>
-    <td>INTERVAL</td>
-    <td>An interval of time. Annotates a fixed_len_byte_array of length 12. Months, days, and ms in unsigned little-endian format.</td>
-  </tr>
-</table>
+| SQL Type                     | Drill Description                                                              | Parquet Logical Type | Parquet Description                                                                                                                        |
+|------------------------------|--------------------------------------------------------------------------------|----------------------|--------------------------------------------------------------------------------------------------------------------------------------------|
+| DATE                         | Years months and days in the form in the form YYYY-­MM-­DD                     | DATE                 | Date, not including time of day. Uses the int32 annotation. Stores the number of days from the Unix epoch, 1 January 1970.                 |
+| VARCHAR                      | Character string variable length                                               | UTF8 (Strings)       | Annotates the binary primitive type. The byte array is interpreted as a UTF-8 encoded character string.                                    |
+| None                         |                                                                                | INT_8                | 8 bits, signed                                                                                                                             |
+| None                         |                                                                                | INT_16               | 16 bits, usigned                                                                                                                           |
+| INT                          | 4-byte signed integer                                                          | INT_32               | 32 bits, signed                                                                                                                            |
+| DOUBLE                       | 8-byte double precision floating point number                                  | INT_64               | 64 bits, signed                                                                                                                            |
+| None                         |                                                                                | UINT_8               | 8 bits, unsigned                                                                                                                           |
+| None                         |                                                                                | UINT_16              | 16 bits, unsigned                                                                                                                          |
+| None                         |                                                                                | UINT_32              | 32 bits, unsigned                                                                                                                          |
+| None                         |                                                                                | UINT_64              | 64 bits, unsigned                                                                                                                          |
+| DECIMAL                      | 38-digit precision                                                             | DECIMAL              | Arbitrary-precision signed decimal numbers of the form unscaledValue * 10^(-scale)                                                         |
+| TIME                         | Hours, minutes, seconds, milliseconds; 24-hour basis                           | TIME_MILLIS          | Logical time, not including the date. Annotates int32. Number of milliseconds after midnight.                                              |
+| TIMESTAMP                    | Year, month, day, and seconds                                                  | TIMESTAMP_MILLIS     | Logical date and time. Annotates an int64 that stores the number of milliseconds from the Unix epoch, 00:00:00.000 on 1 January 1970, UTC. |
+| INTERVALDAY and INTERVALYEAR | Integer fields representing a period of time depending on the type of interval | INTERVAL             | An interval of time. Annotates a fixed_len_byte_array of length 12. Months, days, and ms in unsigned little-endian format.                 |
 
 ## Data Description Language Support
 Parquet supports the following data description languages:

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/data-sources-and-file-formats/050-json-data-model.md
----------------------------------------------------------------------
diff --git a/_docs/data-sources-and-file-formats/050-json-data-model.md b/_docs/data-sources-and-file-formats/050-json-data-model.md
index 8600156..ee6da3e 100644
--- a/_docs/data-sources-and-file-formats/050-json-data-model.md
+++ b/_docs/data-sources-and-file-formats/050-json-data-model.md
@@ -30,33 +30,12 @@ JSON data consists of the following types:
 
 The following table shows SQL-JSON data type mapping, assuming you use the default `all_text_mode` option setting, false: 
 
-<table>
-  <tr>
-    <th>SQL Type</th>
-    <th>JSON Type</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>BOOLEAN</td>
-    <td>Boolean</td>
-    <td>True or false</td>
-  </tr>
-  <tr>
-    <td>BIGINT</td>
-    <td>Numeric</td>
-    <td>Number having no decimal point in JSON, 8-byte signed integer in Drill</td>
-  </tr>
-   <tr>
-    <td>DOUBLE</td>
-    <td>Numeric</td>
-    <td>Number having a decimal point in JSON, 8-byte double precision floating point number in Drill</td>
-  </tr>
-  <tr>
-    <td>VARCHAR</td>
-    <td>String</td>
-    <td>Character string of variable length</td>
-  </tr>
-</table>
+| SQL Type | JSON Type | Description                                                                                   |
+|----------|-----------|-----------------------------------------------------------------------------------------------|
+| BOOLEAN  | Boolean   | True or false                                                                                 |
+| BIGINT   | Numeric   | Number having no decimal point in JSON, 8-byte signed integer in Drill                        |
+| DOUBLE   | Numeric   | Number having a decimal point in JSON, 8-byte double precision floating point number in Drill |
+| VARCHAR  | String    | Character string of variable length                                                           |
 
 Drill does not support JSON lists of different types. For example, JSON does not enforce types or distinguish between integers and floating point values. When reading numerical values from a JSON file, Drill distinguishes integers from floating point numbers by the presence or lack of a decimal point. If some numbers in a JSON map or array appear with and without a decimal point, such as 0 and 0.0, Drill throws a schema change error.
 

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/develop-custom-functions/060-custom-function-interfaces.md
----------------------------------------------------------------------
diff --git a/_docs/develop-custom-functions/060-custom-function-interfaces.md b/_docs/develop-custom-functions/060-custom-function-interfaces.md
index 8000d8e..af46c4a 100644
--- a/_docs/develop-custom-functions/060-custom-function-interfaces.md
+++ b/_docs/develop-custom-functions/060-custom-function-interfaces.md
@@ -15,17 +15,27 @@ When you develop a simple function, you implement the `DrillSimpleFunc` interfac
 
 The `nulls = NullHandling.NULL_IF_NULL` variable tells Drill to return NULL values as NULL. For most scenarios, this setting should suffice. If you want to change how Drill handles NULL values, you can change the setting to `nulls = NullHandling.INTERNAL`.
 
-The simple function interface includes holders where you indicate the data types that your function can process.
+The simple function interface includes the `@Param` and `@Output` holders where you indicate the data types that your function can process.
 
-The following table provides a list of the holders and their descriptions, with examples: 
+### @Param Holder
 
-<table><tbody><tr><th ><strong>Holder</strong></th><th ><strong>Description</strong></th><th ><strong>Example</strong></th></tr><tr><td valign="top" ><code>@Param</code></td><td valign="top" >Indicates the data type that the function processes as input and determines the number of parameters that your function accepts within the query.</td><td valign="top" ><code>@Param BigIntHolder input1;</code><br /><code>@Param BigIntHolder input2;</code></td></tr><tr><td valign="top" ><code>@Output</code></td><td valign="top" >Indicates the data type that the processing returns.</td><td valign="top" ><code>@Output BigIntHolder out;</code> </td></tr></tbody></table>
+This holder indicates the data type that the function processes as input and determines the number of parameters that your function accepts within the query. For example:
 
-The simple function interface also includes two required methods that Drill calls when processing a query with the function.
+    @Param BigIntHolder input1;
+    @Param BigIntHolder input2;
 
-The following table lists the required methods:
+### @Output Holder
 
-<table><tbody><tr><th><strong>Method</strong></th><th ><strong>Description</strong></th></tr><tr><td valign="top" ><code>setup()</code></td><td valign="top" >Performs the initialization and processing that Drill only performs once.</td></tr><tr><td valign="top" ><code>eval()</code></td><td valign="top" >Contains the code that tells Drill what operations to perform on columns of data. You add your custom code to this method.</td></tr></tbody></table>
+This holder indicates the data type that the processing returns. For example:
+
+    @Output BigIntHolder out;
+
+### Setup and Eval Functions
+
+The simple function interface also includes two required methods, setup and eval, that Drill calls when processing a query with the function.
+
+* The setup function performs the initialization and processing that Drill only performs once.
+* The eval function contains the code that tells Drill what operations to perform on columns of data. You add your custom code to this method.
 
 ## Example
 The following example shows the program created for the `myaddints` function:
@@ -69,17 +79,25 @@ When you develop an aggregate function, you implement the `DrillAggFunc` interfa
     @FunctionTemplate(name = "mysecondmin", scope = FunctionTemplate.FunctionScope.POINT_AGGREGATE)
     public static class MySecondMin implements DrillAggFunc {
 
-The aggregate function interface includes holders where you indicate the data types that your function can process.
+The aggregate function interface includes holders where you indicate the data types that your function can process. This interface includes the @Param and @Output holders previously described and also includes the @Workspace holder. 
 
-The following table provides a list of the holders and their descriptions, with examples: 
+### @Workspace holder
 
-<table ><tbody><tr><th ><strong>Holder</strong></th><th ><strong>Description</strong></th><th ><strong>Example</strong></th></tr><tr><td valign="top" ><code>@Param</code></td><td valign="top" >Indicates the data type that the function processes as input and determines the number of parameters that your function accepts within the query.</td><td valign="top" ><code>@Param BigIntHolder in;</code></td></tr><tr><td valign="top" ><code>@Workspace</code></td><td valign="top" >Indicates the data type used to store intermediate data during processing.</td><td valign="top" ><code>@Workspace BigIntHolder min;</code><br><code >@Workspace BigIntHolder secondMin;</code></td></tr><tr><td valign="top" ><code>@Output</code></td><td valign="top" >Indicates the data type that the processing returns.</td><td valign="top" ><code>@Output BigIntHolder out;</code></td></tr></tbody></table>
+This holder indicates the data type used to store intermediate data during processing. For example:
 
-The aggregate function interface also includes four required methods that Drill calls when processing a query with the function.
+    @Workspace BigIntHolder min;
+    @Workspace BigIntHolder secondMin;
 
-The following table lists the required methods:
+The aggregate function interface also includes the following methods that Drill calls when processing a query with the function.
 
-<table><tbody><tr><th ><strong>Method</strong></th><th ><strong>Description</strong></th></tr><tr><td valign="top" ><code>setup()</code></td><td valign="top" >Performs the initialization and processing that Drill only performs once.</td></tr><tr><td valign="top" ><code>add()</code></td><td valign="top" >Processes each and every record. It applies the function to each value in a column that Drill processes.</td></tr><tr><td valign="top" ><code>output()</code></td><td valign="top" >Returns the final result of the aggregate function; the computed value of the processing applied by the Add method. This is the last method that Drill calls. Drill calls this one time after processing all the records.</td></tr><tr><td valign="top" ><code>reset()</code></td><td valign="top" >You provide the code in this method that determines the action Drill takes when data types in a column change from one type to another, for example from int to float. Before processing schema-less data, Drill scans the d
 ata and implicitly tries to identify the data type associated with each column. If Drill cannot identify a schema associated with each column, Drill processes a column assuming that the column contains a certain data type. If Drill encounters another data type in the column, Drill calls the reset method to determine how to handle the scenario.</td></tr></tbody></table>
+* setup
+  Performs the initialization and processing that Drill only performs once.  
+* add
+  Processes each and every record. It applies the function to each value in a column that Drill processes.
+* output
+  Returns the final result of the aggregate function; the computed value of the processing applied by the Add method. This is the last method that Drill calls. Drill calls this one time after processing all the records.
+* reset
+  You provide the code in this method that determines the action Drill takes when data types in a column change from one type to another, for example from int to float. Before processing schema-less data, Drill scans the data and implicitly tries to identify the data type associated with each column. If Drill cannot identify a schema associated with each column, Drill processes a column assuming that the column contains a certain data type. If Drill encounters another data type in the column, Drill calls the reset method to determine how to handle the scenario.
 
 ## Example
 

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/getting-started/010-drill-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/getting-started/010-drill-introduction.md b/_docs/getting-started/010-drill-introduction.md
index b4d876f..2c3c1c4 100644
--- a/_docs/getting-started/010-drill-introduction.md
+++ b/_docs/getting-started/010-drill-introduction.md
@@ -28,9 +28,28 @@ If you've never used Drill, visit these links to get a jump start:
 
 ## Videos
 
-* [Introduction to Apache Drill](https://www.youtube.com/embed/HITzj3ihSUk)
-* [Tableau + Drill](https://www.youtube.com/embed/FkcegazNuio)
-* [Drill Configuration Options](https://www.youtube.com/embed/kG6vzsk8T7E)
-* [Self-service SQL Exploration on MongoDB](https://www.youtube.com/embed/XUIKlsX8yVM)
-* [MicroStrategy + Drill](https://www.youtube.com/embed/uyN9DDCNP8o)
+<table>
+  <tr>
+    <th><a href="http://www.youtube.com/watch?feature=player_embedded&v=HITzj3ihSUk
+" target="_blank"><img src="http://img.youtube.com/vi/HITzj3ihSUk/0.jpg" 
+alt="intro to Drill" width="240" height="180" border="10" />Introduction to Apache Drill</a></th>
+    <th><a href="http://www.youtube.com/watch?feature=player_embedded&v=FkcegazNuio
+" target="_blank"><img src="http://img.youtube.com/vi/FkcegazNuio/0.jpg" 
+alt="Tableau and Drill" width="240" height="180" border="10" />Tableau + Drill</a</th>
+  </tr>
+  <tr>
+    <td><a href="http://www.youtube.com/watch?feature=player_embedded&v=kG6vzsk8T7E
+" target="_blank"><img src="http://img.youtube.com/vi/kG6vzsk8T7E/0.jpg" 
+alt="drill config options" width="240" height="180" border="10" />Drill Configuration Options</a></td>
+    <td><a href="http://www.youtube.com/watch?feature=player_embedded&v=XUIKlsX8yVM
+" target="_blank"><img src="http://img.youtube.com/vi/XUIKlsX8yVM/0.jpg" 
+alt="Self-service SQL Exploration on Mongo" width="240" height="180" border="10" />Self-service SQL Exploration on MongoDB</a></td>
+  </tr>
+  <tr>
+    <td><a href="http://www.youtube.com/watch?feature=player_embedded&v=uyN9DDCNP8o
+" target="_blank"><img src="http://img.youtube.com/vi/uyN9DDCNP8o/0.jpg" 
+alt="Microstrategy and Drill" width="240" height="180" border="10" />Microstrategy + Drill</a></td>
+    <td></td>
+  </tr>
+</table>
 

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/install/047-installing-drill-on-the-cluster.md
----------------------------------------------------------------------
diff --git a/_docs/install/047-installing-drill-on-the-cluster.md b/_docs/install/047-installing-drill-on-the-cluster.md
index 42b22b9..eeef763 100644
--- a/_docs/install/047-installing-drill-on-the-cluster.md
+++ b/_docs/install/047-installing-drill-on-the-cluster.md
@@ -18,7 +18,7 @@ Complete the following steps to install Drill on designated nodes:
        
          drill.exec:{
           cluster-id: "<mydrillcluster>",
-          zk.connect: "<zkhostname1>:<port>,<zkhostname2>:<port>,<zkhostname3>:<port>",
+          zk.connect: "<zkhostname1>:<port>,<zkhostname2>:<port>,<zkhostname3>:<port>"
          }
 
 You can connect Drill to various types of data sources. Refer to [Connect

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/manage-drill/040-ports-used-by-drill.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/040-ports-used-by-drill.md b/_docs/manage-drill/040-ports-used-by-drill.md
index c72beff..42ecd20 100644
--- a/_docs/manage-drill/040-ports-used-by-drill.md
+++ b/_docs/manage-drill/040-ports-used-by-drill.md
@@ -5,5 +5,11 @@ parent: "Manage Drill"
 The following table provides a list of the ports that Drill uses, the port
 type, and a description of how Drill uses the port:
 
-<table ><tbody><tr><th >Port</th><th colspan="1" >Type</th><th >Description</th></tr><tr><td valign="top" >8047</td><td valign="top" colspan="1" >TCP</td><td valign="top" >Needed for <span style="color: rgb(34,34,34);">the Drill Web UI.</span><span style="color: rgb(34,34,34);"> </span></td></tr><tr><td valign="top" >31010</td><td valign="top" colspan="1" >TCP</td><td valign="top" >User port address. Used between nodes in a Drill cluster. <br />Needed for an external client, such as Tableau, to connect into the<br />cluster nodes. Also needed for the Drill Web UI.</td></tr><tr><td valign="top" >31011</td><td valign="top" colspan="1" >TCP</td><td valign="top" >Control port address. Used between nodes in a Drill cluster. <br />Needed for multi-node installation of Apache Drill.</td></tr><tr><td valign="top" colspan="1" >31012</td><td valign="top" colspan="1" >TCP</td><td valign="top" colspan="1" >Data port address. Used between nodes in a Drill cluster. <br />Needed for multi-node ins
 tallation of Apache Drill.</td></tr><tr><td valign="top" colspan="1" >46655</td><td valign="top" colspan="1" >UDP</td><td valign="top" colspan="1" >Used for JGroups and Infinispan. Needed for multi-node installation of Apache Drill.</td></tr></tbody></table></div>
+| Port  | Type | Description                                                                                                                                                                   |
+|-------|------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 8047  | TCP  | Needed for the Drill Web UI.                                                                                                                                                  |
+| 31010 | TCP  | User port address. Used between nodes in a Drill cluster. Needed for an external client, such as Tableau, to connect into thecluster nodes. Also needed for the Drill Web UI. |
+| 31011 | TCP  | Control port address. Used between nodes in a Drill cluster. Needed for multi-node installation of Apache Drill.                                                              |
+| 31012 | TCP  | Data port address. Used between nodes in a Drill cluster. Needed for multi-node installation of Apache Drill.                                                                 |
+| 46655 | UDP  | Used for JGroups and Infinispan. Needed for multi-node installation of Apache Drill.                                                                                          |
 

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/manage-drill/configuration-options/040-persistent-configuration-storage.md
----------------------------------------------------------------------
diff --git a/_docs/manage-drill/configuration-options/040-persistent-configuration-storage.md b/_docs/manage-drill/configuration-options/040-persistent-configuration-storage.md
index 7d0df4d..59180b5 100644
--- a/_docs/manage-drill/configuration-options/040-persistent-configuration-storage.md
+++ b/_docs/manage-drill/configuration-options/040-persistent-configuration-storage.md
@@ -12,7 +12,10 @@ depends on the Drill installation mode.
 The following table provides the persistent storage mode for each of the Drill
 modes:
 
-<table ><tbody><tr><th >Mode</th><th >Description</th></tr><tr><td valign="top" >Embedded</td><td valign="top" >Drill stores persistent data in the local file system. You cannot modify the PStore location for Drill in embedded mode.</td></tr><tr><td valign="top" >Distributed</td><td valign="top" >Drill stores persistent data in ZooKeeper, by default. You can modify where ZooKeeper offloads data, or you can change the persistent storage mode to HBase or MapR-DB.</td></tr></tbody></table></div>
+| Mode        | Description                                                                                                                                                             |
+|-------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Embedded    | Drill stores persistent data in the local file system. You cannot modify the PStore location for Drill in embedded mode.                                                |
+| Distributed | Drill stores persistent data in ZooKeeper, by default. You can modify where ZooKeeper offloads data, or you can change the persistent storage mode to HBase or MapR-DB. |
   
 {% include startnote.html %}Switching between storage modes does not migrate configuration data.{% include endnote.html %}
 

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/odbc-jdbc-interfaces/020-using-jdbc.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/020-using-jdbc.md b/_docs/odbc-jdbc-interfaces/020-using-jdbc.md
index af377b8..d62a5a0 100755
--- a/_docs/odbc-jdbc-interfaces/020-using-jdbc.md
+++ b/_docs/odbc-jdbc-interfaces/020-using-jdbc.md
@@ -67,7 +67,13 @@ To define the Drill JDBC Driver, complete the following steps:
 
 2. Enter the following information:
 
-    <table style='table-layout:fixed;width:100%'><tbody><tr><td valign="top" width="13%"><strong>Option</strong></td><td valign="top" style='width: 460px;'><strong>Description</strong></td></tr><tr><td valign="top">Name</td><td valign="top">Name for the Drill JDBC Driver</td></tr><tr><td valign="top">Example URL</td><td valign="top"><code>jdbc:drill:zk=&lt;<em>zookeeper_quorum</em>&gt;[;schema=&lt;<em>schema_to_use_as_default</em>&gt;]</code><strong>Example:</strong><code> jdbc:drill:zk=maprdemo:5181</code><strong>Note:</strong> The default ZooKeeper port is 2181. In a MapR cluster, the ZooKeeper port is 5181.</td></tr><tr><td valign="top">Website URL</td><td valign="top"><code>jdbc:drill:zk=&lt;<em>zookeeper_quorum</em>&gt;[;schema=&lt;<em>schema_to_use_as_default</em>&gt;]</code><strong>Example:</strong><code><code> jdbc:drill:zk=maprdemo:5181</code></code><strong>Note:</strong><span> The default ZooKeeper port is 2181. In a MapR cluster, the ZooKeeper port is 5181.</span></td></t
 r><tr><td valign="top">Extra Class Path</td><td valign="top">Click <strong>Add</strong> and navigate to the JDBC <code>JAR</code> file location in the Windows directory:<br /><code>&lt;windows_directory&gt;/jars/jdbc-driver/<span style="color: rgb(34,34,34);">drill-jdbc-all-0.6.0-</span><span style="color: rgb(34,34,34);">incubating.jar</span></code>Select the <code>JAR</code> file, click <strong>Open</strong>, and then click <strong>List Drivers</strong>.</td></tr><tr><td valign="top">Class Name</td><td valign="top">Select <code>org.apache.drill.jdbc.Driver</code> from the drop-down menu.</td></tr></tbody></table>  
+    | Option           | Description                                                                                                                                                                                                          |
+    |------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+    | Name             | Name for the Drill JDBC Driver                                                                                                                                                                                       |
+    | Example URL      | jdbc:drill:zk=<zookeeper_quorum>[;schema=<schema_to_use_as_default>]Example: jdbc:drill:zk=maprdemo:5181Note: The default ZooKeeper port is 2181. In a MapR cluster, the ZooKeeper port is 5181.                     |
+    | Website URL      | jdbc:drill:zk=<zookeeper_quorum>[;schema=<schema_to_use_as_default>]Example: jdbc:drill:zk=maprdemo:5181Note: The default ZooKeeper port is 2181. In a MapR cluster, the ZooKeeper port is 5181.                     |
+    | Extra Class Path | Click Add and navigate to the JDBC JAR file location in the Windows directory:<windows_directory>/jars/jdbc-driver/drill-jdbc-all-0.6.0-incubating.jar Select the JAR file, click Open, and then click List Drivers. |
+    | Class Name       | Select org.apache.drill.jdbc.Driver from the drop-down menu.                                                                                                                                                         |
   
 3. Click **OK**. The SQuirreL client displays a message stating that the driver registration is successful, and you can see the driver in the Drivers panel.  
 

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/010-installing-the-driver-on-linux.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/010-installing-the-driver-on-linux.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/010-installing-the-driver-on-linux.md
index efb994c..de40ebf 100755
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/010-installing-the-driver-on-linux.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/010-installing-the-driver-on-linux.md
@@ -92,7 +92,7 @@ following:
   * Installed MapR ODBC Driver for Apache Drill shared libraries
 
 You can have both 32- and 64-bit versions of the driver installed at the same time on the same computer. 
-{% include startimportant.html %}Do not include the paths to both 32- and 64-bit shared libraries in `LD_LIBRARY PATH` at the same time.{% include endimportant.html %}
+{% include startimportant.html %}Do not include the paths to both 32- and 64-bit shared libraries in LD_LIBRARY PATH at the same time.{% include endimportant.html %}
 Only include the path to the shared libraries corresponding to the driver matching the bitness of the client application used.
 
 For example, if you are using a 64-bit client application and ODBC driver

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/040-driver-configuration-options.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/040-driver-configuration-options.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/040-driver-configuration-options.md
index dbb0aab..db1c7d2 100644
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/040-driver-configuration-options.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/040-driver-configuration-options.md
@@ -11,5 +11,15 @@ Drill ODBC Driver on Linux and Mac OS X. You can use these options in a connecti
 The following table provides a list of the configuration options with their
 descriptions:
 
-<table ><tbody><tr><td valign="top"><strong>Property Name</strong></td><td valign="top"><strong>Description</strong></td></tr><tr><td valign="top">AdvancedProperties</td><td valign="top">Separate advanced properties using a semi-colon (;) and then surround all advanced properties in a connection string using braces { and }. <br />For details on supported advanced properties, see Appendix C: Advanced Properties.</td></tr><tr><td valign="top">Catalog</td><td valign="top">The name of the synthetic catalog under which all of the schemas/databases are organized: DRILL</td></tr><tr><td valign="top">ConnectionType</td><td valign="top">The following values are possible:<ul><li>Direct - Connect to a Drill server using Host and Port properties in the connection string.</li><li>ZooKeeper - Connect to a ZooKeeper cluster using ZKQuorum and ZKClusterID properties in the connection string.</li></ul></td></tr><tr><td valign="top">DRIVER</td><td valign="top">(Required) The name of the installed dri
 ver: MapR Drill ODBC Driver </td></tr><tr><td valign="top">Host</td><td valign="top">If the ConnectionType property is set to Direct, then indicate the IP address or hostname of the Drill server using the Host property.</td></tr><tr><td valign="top">Port</td><td valign="top">If the ConnectionType property is set to Direct, then indicate the port on which the Drill server is listening using the Port property.</td></tr><tr><td valign="top">Schema</td><td valign="top">The name of the database schema to use when a schema is not explicitly specified in a query.Note: Queries on other schemas can still be issued by explicitly specifying the schema in the query.</td></tr><tr><td valign="top">ZKClusterID</td><td valign="top">If the ConnectionType property is set to ZooKeeper, then use ZKClusterID to indicate the name of the Drillbit cluster to use.</td></tr><tr><td valign="top">ZKQuorum</td><td valign="top">If the ConnectionType property is set to ZooKeeper, then use ZKQuorum to indicate the
  server(s) in your ZooKeeper cluster. Separate multiple servers using a comma (,).</td></tr></tbody></table>
+| Property Name      | Description                                                                                                                                                                                                                                                                                               |
+|--------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| AdvancedProperties | Separate advanced properties using a semi-colon (;) and then surround all advanced properties in a connection string using braces { and }. For details on supported advanced properties, see Appendix C: Advanced Properties.                                                                             |
+| Catalog            | The name of the synthetic catalog under which all of the schemas/databases are organized: DRILL                                                                                                                                                                                                           |
+| ConnectionType     | The following values are possible: Direct and Zookeeper. The Direct connection type connects to a Drill server using Host and Port properties in the connection string. The Zookeeper connection type connects to a Zookeeper cluster using ZKQuorum and ZKClusterID properties in the connection string. |
+| DRIVER             | (Required) The name of the installed driver: MapR Drill ODBC Driver                                                                                                                                                                                                                                       |
+| Host               | If the ConnectionType property is set to Direct, then indicate the IP address or hostname of the Drill server using the Host property.                                                                                                                                                                    |
+| Port               | If the ConnectionType property is set to Direct, then indicate the port on which the Drill server is listening using the Port property.                                                                                                                                                                   |
+| Schema             | The name of the database schema to use when a schema is not explicitly specified in a query.Note: Queries on other schemas can still be issued by explicitly specifying the schema in the query.                                                                                                          |
+| ZKClusterID        | If the ConnectionType property is set to ZooKeeper, then use ZKClusterID to indicate the name of the Drillbit cluster to use.                                                                                                                                                                             |
+| ZKQuorum           | If the ConnectionType property is set to ZooKeeper, then use ZKQuorum to indicate the server(s) in your ZooKeeper cluster. Separate multiple servers using a comma (,).                                                                                                                                   |
 

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/060-advanced-properties.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/060-advanced-properties.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/060-advanced-properties.md
index a3701db..75b82ac 100644
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/060-advanced-properties.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/060-advanced-properties.md
@@ -15,5 +15,11 @@ TimestampTZDisplayTimezone=utc;ExcludedSchemas=test,abc`
 The following table lists and describes the advanced properties that you can
 set when using the MapR Drill ODBC Driver on Linux and Mac OS X.
 
-<table ><tbody><tr><td valign="top"><strong>Property Name</strong></td><td valign="top"><strong>Default Value</strong></td><td valign="top"><strong>Description</strong></td></tr><tr><td valign="top">HandshakeTimeout</td><td valign="top">5</td><td valign="top">An integer value representing the number of seconds that the driver waits before aborting an attempt to connect to a data source. When set to a value of 0, the driver does not abort connection attempts.</td></tr><tr><td valign="top">QueryTimeout</td><td valign="top">180</td><td valign="top">An integer value representing the number of seconds for the driver to wait before automatically stopping a query. When set to a value of 0, the driver does not stop queries automatically.</td></tr><tr><td valign="top">TimestampTZDisplayTimezone</td><td valign="top">local</td><td valign="top">Two values are possible:local—Timestamps are dependent on the time zone of the user.utc—Timestamps appear in Coordinated Universal Time (UTC).</td><
 /tr><tr><td valign="top">ExcludedSchemas</td><td valign="top">sys, INFORMATION_SCHEMA</td><td valign="top">The value of ExcludedSchemas is a list of schemas that do not appear in client applications such as Drill Explorer, Tableau, and Excel. Separate schemas in the list using a comma (,).</td></tr><tr><td colspan="1" valign="top"><span style="color: rgb(0,0,0);">CastAnyToVarchar</span></td><td colspan="1" valign="top">true</td><td colspan="1" valign="top"><span style="color: rgb(0,0,0);">Casts the “ANY” and “(VARCHAR(1), ANY) MAP” data types returned from SQL column calls into type “VARCHAR”.</span></td></tr></tbody></table>
+| Property Name              | Default Value           | Description                                                                                                                                                                                                |
+|----------------------------|-------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| HandshakeTimeout           | 5                       | An integer value representing the number of seconds that the driver waits before aborting an attempt to connect to a data source. When set to a value of 0, the driver does not abort connection attempts. |
+| QueryTimeout               | 180                     | An integer value representing the number of seconds for the driver to wait before automatically stopping a query. When set to a value of 0, the driver does not stop queries automatically.                |
+| TimestampTZDisplayTimezone | local                   | Two values are possible:local—Timestamps are dependent on the time zone of the user.utc—Timestamps appear in Coordinated Universal Time (UTC).                                                             |
+| ExcludedSchemas            | sys, INFORMATION_SCHEMA | The value of ExcludedSchemas is a list of schemas that do not appear in client applications such as Drill Explorer, Tableau, and Excel. Separate schemas in the list using a comma (,).                    |
+| CastAnyToVarchar           | true                    | Casts the “ANY” and “(VARCHAR(1), ANY) MAP” data types returned from SQL column calls into type “VARCHAR”.                                                                                                 |
 

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/030-connecting-to-data-sources.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/030-connecting-to-data-sources.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/030-connecting-to-data-sources.md
index 4c9a8f3..b778a27 100644
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/030-connecting-to-data-sources.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-windows/030-connecting-to-data-sources.md
@@ -13,7 +13,10 @@ information about Drill Explorer, see [Using Drill Explorer on Windows]({{ site.
 In an ODBC-compliant BI tool, use the ODBC DSN to create an ODBC connection
 with one of the methods applicable to the data source type:
 
-<table ><tbody><tr><th >Data Source Type</th><th >ODBC Connection Method</th></tr><tr><td valign="top">Hive</td><td valign="top">Connect to a table.<br />Connect to the table using custom SQL.<br />Use Drill Explorer to create a view. Then use ODBC to connect to the view as if it were a table.</td></tr><tr><td valign="top">HBase<br /><span style="line-height: 1.4285715;background-color: transparent;">Parquet<br /></span><span style="line-height: 1.4285715;background-color: transparent;">JSON<br /></span><span style="line-height: 1.4285715;background-color: transparent;">CSV<br /></span><span style="line-height: 1.4285715;background-color: transparent;">TSV</span></td><td valign="top">Use Drill Explorer to create a view. Then use ODBC to connect to the view as if it were a table.<br />Connect to the data using custom SQL.</td></tr></tbody></table>
+| Data Source Type               | ODBC Connection Method                                                                                                                                      |
+|--------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Hive                           | Connect to a table. Connect to the table using custom SQL. Use Drill Explorer to create a view. Then use ODBC to connect to the view as if it were a table. |
+| HBase, Parquet, JSON, CSV, TSV | Use Drill Explorer to create a view. Then use ODBC to connect to the view as if it were a table. Connect to the data using custom SQL.                      |
   
 {% include startnote.html %}The default schema that you configure in the DSN may or may not carry over to an application’s data source connections. You may need to re-select the schema.{% include endnote.html %}
 

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/sql-reference/090-sql-extensions.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/090-sql-extensions.md b/_docs/sql-reference/090-sql-extensions.md
index b46d928..bb294f9 100644
--- a/_docs/sql-reference/090-sql-extensions.md
+++ b/_docs/sql-reference/090-sql-extensions.md
@@ -25,33 +25,12 @@ Drill handles plain text files and directories like standard SQL tables and can
 ## SQL Function Extensions
 Drill provides the following functions for analyzing nested data.
 
-<table>
-  <tr>
-    <th>Function</th>
-    <th>SQL</th>
-    <th>Drill</th>
-  </tr>
-  <tr>
-    <td><a href='http://drill.apache.org/docs/flatten-function'>FLATTEN</a> </td>
-    <td>None</td>
-    <td>Separates the elements in nested data from a repeated field into individual records.</td>
-  </tr>
-  <tr>
-    <td><a href='http://drill.apache.org/docs/kvgen-function'>KVGEN</a></td>
-    <td>None</td>
-    <td>Returns a repeated map, generating key-value pairs to simplify querying of complex data having unknown column names. You can then aggregate or filter on the key or value.</td>
-  </tr>
-  <tr>
-    <td><a href='http://drill.apache.org/docs/repeated-count-function'>REPEATED_COUNT</a></td>
-    <td>None</td>
-    <td>Counts the values in an array.</td>
-  </tr>
-  <tr>
-    <td><a href='http://drill.apache.org/docs/repeated-contains'>REPEATED_CONTAINS</a></td>
-    <td>None</td>
-    <td>Searches for a keyword in an array.</td>
-  </tr>
-</table>
+| Function          | SQL  | Drill                                                                                                                                                                      |
+|-------------------|------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| FLATTEN           | None | Separates the elements in nested data from a repeated field into individual records.                                                                                       |
+| KVGEN             | None | Returns a repeated map, generating key-value pairs to simplify querying of complex data having unknown column names. You can then aggregate or filter on the key or value. |
+| REPEATED_COUNT    | None | Counts the values in an array.                                                                                                                                             |
+| REPEATED_CONTAINS | None | Searches for a keyword in an array.                                                                                                                                        |
 
 ## Other Extensions
 

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_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 f5ef3da..5641dc4 100644
--- a/_docs/sql-reference/data-types/010-supported-data-types.md
+++ b/_docs/sql-reference/data-types/010-supported-data-types.md
@@ -4,83 +4,24 @@ parent: "Data Types"
 ---
 Drill reads from and writes to data sources having a wide variety of types. Drill uses data types at the RPC level that are not supported for query input, often implicitly casting data. Drill supports the following SQL data types for query input:
 
-<table>
-  <tr>
-    <th>SQL Data Type</th>
-    <th>Description</th>
-    <th>Example</th>
-  </tr>
-  <tr>
-    <td valign="top">BIGINT</td>
-    <td valign="top">8-byte signed integer in the range -9,223,372,036,854,775,808 to 9,223,372,036,854,775,807</td>
-    <td valign="top">9223372036854775807</td>
-  </tr>
-  <tr>
-    <td valign="top">BINARY VARYING, VARBINARY, BINARY</td>
-    <td valign="top">Variable-length byte string</td>
-    <td valign="top">B@e6d9eb7</td>
-  </tr>
-  <tr>
-    <td valign="top">BOOLEAN</td>
-    <td valign="top">True or false</td>
-    <td valign="top">true</td>
-  </tr>
-  <tr>
-    <td valign="top">DATE</td>
-    <td valign="top">Years, months, and days in YYYY-MM-DD format since 4713 BC</td>
-    <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">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>
-  <tr>
-    <td valign="top">FLOAT</td>
-    <td valign="top">4-byte floating point number</td>
-    <td valign="top">0.456<br><a href="http://apache.github.io/drill/docs/handling-different-data-types/">See guidelines</a></td>
-  </tr>
-  <tr>
-    <td valign="top">DOUBLE, DOUBLE PRECISION</td>
-    <td valign="top">8-byte floating point number, precision-scalable. Precision (p) is digits in the number. Scale (s) is digits to the right of the decimal point. Specify both p and s or neither. Default is 1.</td>
-    <td valign="top">0.456<br><a href="http://apache.github.io/drill/docs/handling-different-data-types/">See guidelines</a></td>
-  </tr>
-  <tr>
-    <td valign="top">INTEGER or INT</td>
-    <td valign="top">4-byte signed integer in the range -2,147,483,648 to 2,147,483,647</td>
-    <td valign="top">2147483646</td>
-  </tr>
-  <tr>
-    <td valign="top">INTERVALDAY</td>
-    <td valign="top">A period of time in days, hours, minutes, and seconds only</td>
-    <td valign="top">'1 10:20:30.123'<br><a href="http://apache.github.io/drill/docs/date-time-and-timestamp/#intervalyear-and-intervalday">More examples</a></td>
-  </tr>
-  <tr>
-    <td valign="top">INTERVALYEAR</td>
-    <td valign="top">A period of time in years and months only</td>
-    <td valign="top">'1-2' year to month<br><a href="http://apache.github.io/drill/docs/data-type-conversion/#casting-intervals">More examples</a></td>
-  </tr>
-  <tr>
-    <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>
-  <tr>
-    <td valign="top">TIME</td>
-    <td valign="top">24-hour based time before or after January 1, 2001 in hours, minutes, seconds format: HH:mm:ss</td>
-    <td valign="top">22:55:55.23<br><a href="http://apache.github.io/drill/docs/date-time-and-timestamp/">More examples</a></td>
-  </tr>
-  <tr>
-    <td valign="top">TIMESTAMP</td>
-    <td valign="top">JDBC timestamp in year, month, date hour, minute, second, and optional milliseconds format: yyyy-MM-dd HH:mm:ss.SSS</td>
-    <td valign="top">2015-12-30 22:55:55.23<br> <a href="http://apache.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">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>
+| SQL Data Type                                     | Description                                                                                                          | Example                                                                        |
+|---------------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------|
+| BIGINT                                            | 8-byte signed integer in the range -9,223,372,036,854,775,808 to 9,223,372,036,854,775,807                           | 9223372036854775807                                                            |
+| BINARY                                            | Variable-length byte string                                                                                          | B@e6d9eb7                                                                      |
+| BOOLEAN                                           | True or false                                                                                                        | true                                                                           |
+| DATE                                              | Years, months, and days in YYYY-MM-DD format since 4713 BC                                                           | 2015-12-30                                                                     |
+| DECIMAL(p,s), or DEC(p,s), NUMERIC(p,s)*          | 38-digit precision number, precision is p, and scale is s                                                            | DECIMAL(6,2) is 1234.56,  4 digits before and 2 digits after the decimal point |
+| FLOAT                                             | 4-byte floating point number                                                                                         | 0.456                                                                          |
+| DOUBLE, DOUBLE PRECISION                          | 8-byte floating point number, precision-scalable                                                                     | 0.456                                                                          |
+| INTEGER or INT                                    | 4-byte signed integer in the range -2,147,483,648 to 2,147,483,647                                                   | 2147483646                                                                     |
+| INTERVALDAY                                       | A period of time in days, hours, minutes, and seconds only                                                           | '1 10:20:30.123'                                                               |
+| INTERVALYEAR                                      | A period of time in years and months only                                                                            | '1-2' year to month                                                            |
+| SMALLINT**                                        | 2-byte signed integer in the range -32,768 to 32,767                                                                 | 32000                                                                          |
+| TIME                                              | 24-hour based time before or after January 1, 2001 in hours, minutes, seconds format: HH:mm:ss                       | 22:55:55.23                                                                    |
+| TIMESTAMP                                         | JDBC timestamp in year, month, date hour, minute, second, and optional milliseconds format: yyyy-MM-dd HH:mm:ss.SSS  | 2015-12-30 22:55:55.23                                                         |
+| CHARACTER VARYING, CHARACTER, CHAR, or VARCHAR*** | UTF8-encoded variable-length string. The default limit is 1 character. The maximum character limit is 2,147,483,647. | CHAR(30) casts data to a 30-character string maximum.                          |
+
+
 \* 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.  
@@ -112,86 +53,25 @@ In some cases, Drill converts schema-less data to correctly-typed data implicitl
 
 ## Precedence of Data Types
 
-The following list includes data types Drill uses in descending order of precedence. As shown in the table, you can cast a NULL value, which has the lowest precedence, to any other type; you can cast a SMALLINT value to INT. You cannot cast an INT value to SMALLINT due to possible precision loss. Drill might deviate from these precedence rules for performance reasons. Under certain circumstances, such as queries involving SUBSTR and CONCAT functions, Drill reverses the order of precedence and allows a cast to VARCHAR from a type of higher precedence than VARCHAR, such as BIGINT.
+The following list includes data types Drill uses in descending order of precedence. As shown in the table, you can cast a NULL value, which has the lowest precedence, to any other type; you can cast a SMALLINT (not supported in this release) value to INT. You cannot cast an INT value to SMALLINT due to possible precision loss. Drill might deviate from these precedence rules for performance reasons. Under certain circumstances, such as queries involving SUBSTR and CONCAT functions, Drill reverses the order of precedence and allows a cast to VARCHAR from a type of higher precedence than VARCHAR, such as BIGINT.
 
 ### Casting Precedence
 
-<table>
-  <tr>
-    <th>Precedence</th>
-    <th>Data Type</th>
-    <th>Precedence</th>
-    <th>Data Type</th>
-  </tr>
-  <tr>
-    <td valign="top">1</td>
-    <td valign="top">INTERVALYEAR (highest)</td>
-    <td valign="top">11</td>
-    <td valign="top">INT</td>
-  </tr>
-  <tr>
-    <td valign="top">2</td>
-    <td valign="top">INTERVLADAY</td>
-    <td valign="top">12</td>
-    <td valign="top">UINT2</td>
-  </tr>
-  <tr>
-    <td valign="top">3</td>
-    <td valign="top">TIMESTAMP</td>
-    <td valign="top">13</td>
-    <td valign="top">SMALLINT</td>
-  </tr>
-  <tr>
-    <td valign="top">4</td>
-    <td valign="top">DATE</td>
-    <td valign="top">14</td>
-    <td valign="top">UINT1</td>
-  </tr>
-  <tr>
-    <td valign="top">5</td>
-    <td valign="top">TIME</td>
-    <td valign="top">15</td>
-    <td valign="top">VAR16CHAR</td>
-  </tr>
-  <tr>
-    <td valign="top">6</td>
-    <td valign="top">DOUBLE</td>
-    <td valign="top">16</td>
-    <td valign="top">FIXED16CHAR</td>
-  </tr>
-  <tr>
-    <td valign="top">7</td>
-    <td valign="top">DECIMAL</td>
-    <td valign="top">17</td>
-    <td valign="top">VARCHAR</td>
-  </tr>
-  <tr>
-    <td valign="top">8</td>
-    <td valign="top">UINT8</td>
-    <td valign="top">18</td>
-    <td valign="top">CHAR</td>
-  </tr>
-  <tr>
-    <td valign="top">9</td>
-    <td valign="top">BIGINT</td>
-    <td valign="top">19</td>
-    <td valign="top">VARBINARY*</td>
-  </tr>
-  <tr>
-    <td valign="top">10</td>
-    <td valign="top">UINT4</td>
-    <td valign="top">20</td>
-    <td valign="top">FIXEDBINARY**</td>
-  </tr>
-  <tr>
-    <td valign="top"></td>
-    <td valign="top"></td>
-    <td valign="top">21</td>
-    <td valign="top">NULL (lowest)</td>
-  </tr>
-</table>
-
-\* The Drill Parquet reader supports these types.
+| Precedence | Data Type              | Precedence | Data Type   |
+|------------|------------------------|------------|-------------|
+| 1          | INTERVALYEAR (highest) | 11         | INT         |
+| 2          | INTERVLADAY            | 12         | UINT2       |
+| 3          | TIMESTAMP              | 13         | SMALLINT*   |
+| 4          | DATE                   | 14         | UINT1       |
+| 5          | TIME                   | 15         | VAR16CHAR   |
+| 6          | DOUBLE                 | 16         | FIXED16CHAR |
+| 7          | DECIMAL                | 17         | VARCHAR     |
+| 8          | UINT8                  | 18         | CHAR        |
+| 9          | BIGINT                 | 19         | VARBINARY   |
+| 10         | UINT4                  | 20         | FIXEDBINARY |
+| 21         | NULL (lowest)          |            |             |
+
+\* Not supported in this release.
 
 ## Explicit Casting
 
@@ -218,268 +98,40 @@ The following tables show data types that Drill can cast to/from other data type
 
 ### Numerical and Character Data Types
 
-<table>
-  <tr>
-    <th></th>
-    <th>To:</th>
-    <th></th>
-    <th></th>
-    <th></th>
-    <th></th>
-    <th></th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-  <tr>
-    <td valign="top">From:</td>
-    <td valign="top">SMALLINT</td>
-    <td valign="top">INT</td>
-    <td valign="top">BIGINT</td>
-    <td valign="top">DECIMAL</td>
-    <td valign="top">FLOAT</td>
-    <td valign="top">CHAR</td>
-    <td valign="top">FIXEDBINARY</td>
-    <td valign="top">VARCHAR</td>
-    <td valign="top">VARBINARY</td>
-  </tr>
-  <tr>
-    <td valign="top">SMALLINT*</td>
-    <td valign="top"></td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-  </tr>
-  <tr>
-    <td valign="top">INT</td>
-    <td valign="top">yes</td>
-    <td valign="top">no</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-  </tr>
-  <tr>
-    <td valign="top">BIGINT</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-  </tr>
-  <tr>
-    <td valign="top">DECIMAL</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-  </tr>
-  <tr>
-    <td valign="top">DOUBLE</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">no</td>
-    <td valign="top">yes</td>
-    <td valign="top">no</td>
-  </tr>
-  <tr>
-    <td valign="top">FLOAT</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">no</td>
-    <td valign="top">yes</td>
-    <td valign="top">no</td>
-    <td valign="top">yes</td>
-    <td valign="top">no</td>
-  </tr>
-  <tr>
-    <td valign="top">CHAR</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">no</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-  </tr>
-  <tr>
-    <td valign="top">FIXEDBINARY**</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">no</td>
-    <td valign="top">no</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-  </tr>
-  <tr>
-    <td valign="top">VARCHAR***</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">no</td>
-    <td valign="top">yes</td>
-  </tr>
-  <tr>
-    <td valign="top">VARBINARY**</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">no</td>
-    <td valign="top">yes</td>
-    <td valign="top">yes</td>
-    <td valign="top">no</td>
-  </tr>
-</table>
+| To            | SMALLINT | INT | BIGINT | DECIMAL | FLOAT | CHAR | FIXEDBINARY | VARCHAR | VARBINARY |
+|---------------|----------|-----|--------|---------|-------|------|-------------|---------|-----------|
+| **From:**     |          |     |        |         |       |      |             |         |           |
+| SMALLINT*     |          | yes | yes    | yes     | yes   | yes  | yes         | yes     | yes       |
+| INT           | yes      | no  | yes    | yes     | yes   | yes  | yes         | yes     | yes       |
+| BIGINT        | yes      | yes | yes    | yes     | yes   | yes  | yes         | yes     | yes       |
+| DECIMAL       | yes      | yes | yes    | yes     | yes   | yes  | yes         | yes     | yes       |
+| DOUBLE        | yes      | yes | yes    | yes     | yes   | yes  | no          | yes     | no        |
+| FLOAT         | yes      | yes | yes    | yes     | no    | yes  | no          | yes     | no        |
+| CHAR          | yes      | yes | yes    | yes     | yes   | no   | yes         | yes     | yes       |
+| FIXEDBINARY** | yes      | yes | yes    | yes     | yes   | no   | no          | yes     | yes       |
+| VARCHAR***    | yes      | yes | yes    | yes     | yes   | yes  | yes         | no      | yes       |
+| VARBINARY**   | yes      | yes | yes    | yes     | yes   | no   | yes         | yes     | no        |
+
+
 \* Not supported in this release.   
 \*\* Used to cast binary data coming to/from sources such as MapR-DB/HBase.   
 \*\*\* You cannot convert a character string having a decimal point to an INT or BIGINT.   
 
 ### Date and Time Data Types
 
-<table>
-  <tr>
-    <th></th>
-    <th>To:</th>
-    <th></th>
-    <th></th>
-    <th></th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-  <tr>
-    <td valign="top">From:</td>
-    <td valign="top">DATE</td>
-    <td valign="top">TIME</td>
-    <td valign="top">TIMESTAMP</td>
-    <td valign="top">INTERVALYEAR</td>
-    <td valign="top">INTERVALDAY</td>
-  </tr>
-  <tr>
-    <td valign="top">CHAR</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">FIXEDBINARY*</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-    <td valign="top">Yes</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">VARCHAR</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">VARBINARY*</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">DATE</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">TIME</td>
-    <td valign="top">No</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">TIMESTAMP</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-    <td valign="top">No</td>
-  </tr>
-  <tr>
-    <td valign="top">INTERVALYEAR</td>
-    <td valign="top">Yes</td>
-    <td valign="top">No</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">No</td>
-    <td valign="top">Yes</td>
-  </tr>
-  <tr>
-    <td valign="top">INTERVALDAY</td>
-    <td valign="top">Yes</td>
-    <td valign="top">No</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">Yes</td>
-    <td valign="top">No</td>
-  </tr>
-</table>
+| To:          | DATE | TIME | TIMESTAMP | INTERVALDAY | INTERVALYEAR | INTERVALDAY |
+|--------------|------|------|-----------|-------------|--------------|-------------|
+| From:        |      |      |           |             |              |             |
+| CHAR         | Yes  | Yes  | Yes       | Yes         | Yes          | Yes         |
+| FIXEDBINARY* | No   | No   | No        | No          | No           | No          |
+| VARCHAR      | Yes  | Yes  | Yes       | Yes         | Yes          | Yes         |
+| VARBINARY*   | No   | No   | Yes       | No          | No           | No          |
+| DATE         | No   | No   | Yes       | No          | No           | No          |
+| TIME         | No   | Yes  | Yes       | No          | No           | No          |
+| TIMESTAMP    | Yes  | Yes  | Yes       | No          | No           | No          |
+| INTERVALYEAR | Yes  | No   | Yes       | Yes         | No           | Yes         |
+| INTERVALDAY  | Yes  | No   | Yes       | Yes         | Yes          | No          |
+
 \* Used to cast binary data coming to/from sources such as MapR-DB/HBase.   
 
 ## CONVERT_TO and CONVERT_FROM Data Types

http://git-wip-us.apache.org/repos/asf/drill/blob/04ed3f56/_docs/sql-reference/sql-functions/010-math-and-trig.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-functions/010-math-and-trig.md b/_docs/sql-reference/sql-functions/010-math-and-trig.md
index bef3c70..e653b34 100644
--- a/_docs/sql-reference/sql-functions/010-math-and-trig.md
+++ b/_docs/sql-reference/sql-functions/010-math-and-trig.md
@@ -16,138 +16,33 @@ Exceptions are the LSHIFT and RSHIFT functions, which take all types except FLOA
 
 ## Table of Math Functions
 
-<table>
-  <tr>
-    <th>Function</th>
-    <th>Return Type</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>ABS(x)</td>
-    <td>Same as input</td>
-    <td>Returns the absolute value of the input argument x.</td>
-  </tr>
-  <tr>
-    <td>CBRT(x)</td>
-    <td>FLOAT8</td>
-    <td>Returns the cubic root of x.</td>
-  </tr>
-  <tr>
-    <td>CEIL(x)</td>
-    <td>Same as input</td>
-    <td>Returns the smallest integer not less than x.</td>
-  </tr>
-  <tr>
-    <td>CEILING(x)</td>
-    <td>Same as input</td>
-    <td>Same as CEIL.</td>
-  </tr>
-  <tr>
-    <td>DEGREES(x)</td>
-    <td>FLOAT8</td>
-    <td>Converts x radians to degrees.</td>
-  </tr>
-  <tr>
-    <td>E()</td>
-    <td>FLOAT8</td>
-    <td>Returns 2.718281828459045.</td>
-  </tr>
-  <tr>
-    <td>EXP(x)</td>
-    <td>FLOAT8</td>
-    <td>Returns e (Euler's number) to the power of x.</td>
-  </tr>
-  <tr>
-    <td>FLOOR(x)</td>
-    <td>Same as input</td>
-    <td>Returns the largest integer not greater than x.</td>
-  </tr>
-  <tr>
-    <td>LOG(x)</td>
-    <td>FLOAT8</td>
-    <td>Returns the natural log (base e) of x.</td>
-  </tr>
-  <tr>
-    <td>LOG(x, y)</td>
-    <td>FLOAT8</td>
-    <td>Returns log base x to the y power.</td>
-  </tr>
-  <tr>
-    <td>LOG10(x)</td>
-    <td>FLOAT8</td>
-    <td>Returns the common log of x.</td>
-  </tr>
-  <tr>
-    <td>LSHIFT(x, y)</td>
-    <td>Same as input</td>
-    <td>Shifts the binary x by y times to the left.</td>
-  </tr>
-  <tr>
-    <td>MOD(x, y)</td>
-    <td>FLOAT8</td>
-    <td>Returns the remainder of x divided by y. Requires a cast to DECIMAL for consistent results when x and y are FLOAT or DOUBLE.</td>
-  </tr>
-  <tr>
-    <td>NEGATIVE(x)</td>
-    <td>Same as input</td>
-    <td>Returns x as a negative number.</td>
-  </tr>
-  <tr>
-    <td>PI</td>
-    <td>FLOAT8</td>
-    <td>Returns pi.</td>
-  </tr>
-  <tr>
-    <td>POW(x, y)</td>
-    <td>FLOAT8</td>
-    <td>Returns the value of x to the y power.</td>
-  </tr>
-  <tr>
-    <td>RADIANS</td>
-    <td>FLOAT8</td>
-    <td>Converts x degress to radians.</td>
-  </tr>
-  <tr>
-    <td>RAND</td>
-    <td>FLOAT8</td>
-    <td>Returns a random number from 0-1.</td>
-  </tr>
-  <tr>
-    <td>ROUND(x)</td>
-    <td>Same as input</td>
-    <td>Rounds to the nearest integer.</td>
-  </tr>
-  <tr>
-    <td>ROUND(x, y)</td>
-    <td>DECIMAL</td>
-    <td>Rounds x to s decimal places.</td>
-  </tr>
-  <tr>
-    <td>RSHIFT(x, y)</td>
-    <td>Same as input</td>
-    <td>Shifts the binary x by y times to the right.</td>
-  </tr>
-  <tr>
-    <td>SIGN(x)</td>
-    <td>INT</td>
-    <td>Returns the sign of x.</td>
-  </tr>
-  <tr>
-    <td>SQRT(x)</td>
-    <td>Same as input</td>
-    <td>Returns the square root of x.</td>
-  </tr>
-  <tr>
-    <td>TRUNC(x, y)</td>
-    <td>Same as input</td>
-    <td>Truncates x to y decimal places. Specifying y is optional. Default is 1.</td>
-  </tr>
-  <tr>
-    <td>TRUNC(x, y)</td>
-    <td>DECIMAL</td>
-    <td>Truncates x to y decimal places.</td>
-  </tr>
-</table>
+| Function     | Return Type   | Description                                                                                                                  |
+|--------------|---------------|------------------------------------------------------------------------------------------------------------------------------|
+| ABS(x)       | Same as input | Returns the absolute value of the input argument x.                                                                          |
+| CBRT(x)      | FLOAT8        | Returns the cubic root of x.                                                                                                 |
+| CEIL(x)      | Same as input | Returns the smallest integer not less than x.                                                                                |
+| CEILING(x)   | Same as input | Same as CEIL.                                                                                                                |
+| DEGREES(x)   | FLOAT8        | Converts x radians to degrees.                                                                                               |
+| E()          | FLOAT8        | Returns 2.718281828459045.                                                                                                   |
+| EXP(x)       | FLOAT8        | Returns e (Euler's number) to the power of x.                                                                                |
+| FLOOR(x)     | Same as input | Returns the largest integer not greater than x.                                                                              |
+| LOG(x)       | FLOAT8        | Returns the natural log (base e) of x.                                                                                       |
+| LOG(x, y)    | FLOAT8        | Returns log base x to the y power.                                                                                           |
+| LOG10(x)     | FLOAT8        | Returns the common log of x.                                                                                                 |
+| LSHIFT(x, y) | Same as input | Shifts the binary x by y times to the left.                                                                                  |
+| MOD(x, y)    | FLOAT8        | Returns the remainder of x divided by y. Requires a cast to DECIMAL for consistent results when x and y are FLOAT or DOUBLE. |
+| NEGATIVE(x)  | Same as input | Returns x as a negative number.                                                                                              |
+| PI           | FLOAT8        | Returns pi.                                                                                                                  |
+| POW(x, y)    | FLOAT8        | Returns the value of x to the y power.                                                                                       |
+| RADIANS      | FLOAT8        | Converts x degress to radians.                                                                                               |
+| RAND         | FLOAT8        | Returns a random number from 0-1.                                                                                            |
+| ROUND(x)     | Same as input | Rounds to the nearest integer.                                                                                               |
+| ROUND(x, y)  | DECIMAL       | Rounds x to s decimal places.                                                                                                |
+| RSHIFT(x, y) | Same as input | Shifts the binary x by y times to the right.                                                                                 |
+| SIGN(x)      | INT           | Returns the sign of x.                                                                                                       |
+| SQRT(x)      | Same as input | Returns the square root of x.                                                                                                |
+| TRUNC(x, y)  | Same as input | Truncates x to y decimal places. Specifying y is optional. Default is 1.                                                     |
+| TRUNC(x, y)  | DECIMAL       | Truncates x to y decimal places.                                                                                             |
 
 ## Math Function Examples
 


Mime
View raw message