You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by br...@apache.org on 2015/07/08 03:20:49 UTC
drill-site git commit: Drill 1.1 Updates and Edits
Repository: drill-site
Updated Branches:
refs/heads/asf-site f77ab7836 -> 94a79d4ed
Drill 1.1 Updates and Edits
Project: http://git-wip-us.apache.org/repos/asf/drill-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill-site/commit/94a79d4e
Tree: http://git-wip-us.apache.org/repos/asf/drill-site/tree/94a79d4e
Diff: http://git-wip-us.apache.org/repos/asf/drill-site/diff/94a79d4e
Branch: refs/heads/asf-site
Commit: 94a79d4ed6524f97918797ff32e4d7223df9fb4c
Parents: f77ab78
Author: Bridget Bevens <bb...@maprtech.com>
Authored: Tue Jul 7 18:20:32 2015 -0700
Committer: Bridget Bevens <bb...@maprtech.com>
Committed: Tue Jul 7 18:20:32 2015 -0700
----------------------------------------------------------------------
.../index.html | 44 ++++++++++-
.../index.html | 81 ++++++++++----------
docs/drill-default-input-format/index.html | 2 +-
docs/drill-introduction/index.html | 5 +-
docs/hive-storage-plugin/index.html | 71 +++++++++++------
docs/hive-to-drill-data-type-mapping/index.html | 30 +++-----
.../index.html | 4 +-
docs/installing-the-driver-on-linux/index.html | 10 +--
.../index.html | 2 +-
.../installing-the-driver-on-windows/index.html | 4 +-
docs/mongodb-plugin-for-apache-drill/index.html | 2 +-
docs/plugin-configuration-basics/index.html | 2 +-
docs/querying-the-information-schema/index.html | 2 +-
docs/select/index.html | 2 +-
docs/union-set-operator/index.html | 2 +-
feed.xml | 4 +-
16 files changed, 159 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/aggregate-and-aggregate-statistical/index.html
----------------------------------------------------------------------
diff --git a/docs/aggregate-and-aggregate-statistical/index.html b/docs/aggregate-and-aggregate-statistical/index.html
index 4507932..a001354 100644
--- a/docs/aggregate-and-aggregate-statistical/index.html
+++ b/docs/aggregate-and-aggregate-statistical/index.html
@@ -1047,9 +1047,49 @@ Drill queries:</p>
</tr>
</tbody></table>
-<p>* In this release, Drill disables the DECIMAL data type, including casting to DECIMAL and reading DECIMAL types from Parquet and Hive. You can <a href="docs/supported-data-types/#enabling-the-decimal-type">enable the DECIMAL type</a>, but this is not recommented.</p>
+<p>* In this release, Drill disables the DECIMAL data type, including casting to DECIMAL and reading DECIMAL types from Parquet and Hive. You can <a href="docs/supported-data-types/#enabling-the-decimal-type">enable the DECIMAL type</a>, but this is not recommended.</p>
-<p>MIN, MAX, COUNT, AVG, and SUM accept ALL and DISTINCT keywords. The default is ALL.</p>
+<p>AVG, COUNT, MIN, MAX, and SUM accept ALL and DISTINCT keywords. The default is ALL.</p>
+
+<h2 id="avg">AVG</h2>
+
+<p>Averages a column of all records in a data source. Averages a column of one or more groups of records. Which records to include in the calculation can be based on a condition.</p>
+
+<h3 id="syntax">Syntax</h3>
+<div class="highlight"><pre><code class="language-text" data-lang="text">SELECT AVG(aggregate_expression)
+FROM tables
+WHERE conditions;
+
+SELECT expression1, expression2, ... expression_n,
+ AVG(aggregate_expression)
+FROM tables
+WHERE conditions
+GROUP BY expression1, expression2, ... expression_n;
+</code></pre></div>
+<p>Expressions listed within the AVG function and must be included in the GROUP BY clause.</p>
+
+<h3 id="examples">Examples</h3>
+<div class="highlight"><pre><code class="language-text" data-lang="text">SELECT AVG(salary) FROM cp.`employee.json`;
++---------------------+
+| EXPR$0 |
++---------------------+
+| 4019.6017316017314 |
++---------------------+
+1 row selected (0.221 seconds)
+
+SELECT education_level, AVG(salary) FROM cp.`employee.json` GROUP BY education_level;
++----------------------+---------------------+
+| education_level | EXPR$1 |
++----------------------+---------------------+
+| Graduate Degree | 4392.823529411765 |
+| Bachelors Degree | 4492.404181184669 |
+| Partial College | 4047.1180555555557 |
+| High School Degree | 3516.1565836298932 |
+| Partial High School | 3511.0852713178297 |
++----------------------+---------------------+
+5 rows selected (0.495 seconds)
+</code></pre></div>
+<h2 id="count,-min,-max,-and-sum">COUNT, MIN, MAX, and SUM</h2>
<h3 id="examples">Examples</h3>
<div class="highlight"><pre><code class="language-text" data-lang="text">SELECT a2 FROM t2;
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/configuring-user-impersonation-with-hive-authorization/index.html
----------------------------------------------------------------------
diff --git a/docs/configuring-user-impersonation-with-hive-authorization/index.html b/docs/configuring-user-impersonation-with-hive-authorization/index.html
index 0c0320a..a87c7b2 100644
--- a/docs/configuring-user-impersonation-with-hive-authorization/index.html
+++ b/docs/configuring-user-impersonation-with-hive-authorization/index.html
@@ -1055,7 +1055,7 @@
<li>If the underlying file system has MapR security enabled, add the following line:
<code>export MAPR_TICKETFILE_LOCATION=/opt/mapr/conf/mapruserticket</code><br></li>
<li>If you are implementing Hive SQL standard based authorization, and you are running Drill and Hive in a secure MapR cluster, add the following lines:<br>
-<code>export DRILLBIT_JAVA_OPTS="$DRILLBIT_JAVA_OPTS -Dmapr_sec_enabled=true -Dhadoop.login=maprsasl -Dzookeeper.saslprovider=com.mapr.security.maprsasl.MaprSaslProvider -Dmapr.library.flatclass"</code><br>
+<code>export DRILL_JAVA_OPTS="$DRILL_JAVA_OPTS -Dmapr_sec_enabled=true -Dhadoop.login=maprsasl -Dzookeeper.saslprovider=com.mapr.security.maprsasl.MaprSaslProvider -Dmapr.library.flatclass"</code><br>
<code>export MAPR_IMPERSONATION_ENABLED=true</code><br>
<code>export MAPR_TICKETFILE_LOCATION=/opt/mapr/conf/mapruserticket</code></li>
</ul></li>
@@ -1195,56 +1195,59 @@
<p>Modify the Hive storage plugin instance in the Drill Web UI to include specific authorization settings. The Drillbit that you use to access the Web UI must be running. </p>
-<p>Note: The metastore host port for MapR is typically 9083. </p>
+<div class="admonition note">
+ <p class="first admonition-title">Note</p>
+ <p class="last">The metastore host port for MapR is typically 9083. </p>
+</div>
<p>Complete the following steps to modify the Hive storage plugin: </p>
<ol>
<li> Navigate to <code>http://<drillbit_hostname>:8047</code>, and select the <strong>Storage tab</strong>.<br></li>
<li> Click <strong>Update</strong> next to the hive instance.<br></li>
-<li><p>In the configuration window, add the configuration settings for the authorization type. </p>
+<li> In the configuration window, add the configuration settings for the authorization type. If you are running Drill and Hive in a secure MapR cluster, do not include the line <code>"hive.metastore.sasl.enabled" : "false"</code>.<br></li>
+</ol>
<ul>
<li><p>For storage based authorization, add the following settings: </p>
-<div class="highlight"><pre><code class="language-text" data-lang="text"> {
- type:"hive",
- enabled: true,
- configProps : {
- "hive.metastore.uris" : "thrift://<metastore_host>:<port>",
- "fs.default.name" : "hdfs://<host>:<port>/",
- "hive.metastore.sasl.enabled" : "false",
- "hive.server2.enable.doAs" : "true",
- "hive.metastore.execute.setugi" : "true"
- }
- }
+<div class="highlight"><pre><code class="language-text" data-lang="text"> {
+ type:"hive",
+ enabled: true,
+ configProps : {
+ "hive.metastore.uris" : "thrift://<metastore_host>:<port>",
+ "fs.default.name" : "hdfs://<host>:<port>/",
+ "hive.metastore.sasl.enabled" : "false",
+ "hive.server2.enable.doAs" : "true",
+ "hive.metastore.execute.setugi" : "true"
+ }
+ }
</code></pre></div></li>
<li><p>For SQL standard based authorization, add the following settings: </p>
-<div class="highlight"><pre><code class="language-text" data-lang="text"> {
- type:"hive",
- enabled: true,
- configProps : {
- "hive.metastore.uris"
- : "thrift://<metastore_host>:<port>",
- "fs.default.name"
- : "hdfs://<host>:<port>/",
- "hive.security.authorization.enabled"
- : "true",
- "hive.security.authenticator.manager"
- : "org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator",
- "hive.security.authorization.manager"
- :
- "org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory",
- "hive.metastore.sasl.enabled"
- : "false",
- "hive.server2.enable.doAs"
- : "false",
- "hive.metastore.execute.setugi"
- : "false"
- }
- }
+<div class="highlight"><pre><code class="language-text" data-lang="text"> {
+ type:"hive",
+ enabled: true,
+ configProps : {
+ "hive.metastore.uris"
+ : "thrift://<metastore_host>:<port>",
+ "fs.default.name"
+ : "hdfs://<host>:<port>/",
+ "hive.security.authorization.enabled"
+ : "true",
+ "hive.security.authenticator.manager"
+ : "org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator",
+ "hive.security.authorization.manager"
+ :
+ "org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory",
+ "hive.metastore.sasl.enabled"
+ : "false",
+ "hive.server2.enable.doAs"
+ : "false",
+ "hive.metastore.execute.setugi"
+ : "false"
+ }
+ }
</code></pre></div></li>
-</ul></li>
-</ol>
+</ul>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/drill-default-input-format/index.html
----------------------------------------------------------------------
diff --git a/docs/drill-default-input-format/index.html b/docs/drill-default-input-format/index.html
index a7caaaf..c88e238 100644
--- a/docs/drill-default-input-format/index.html
+++ b/docs/drill-default-input-format/index.html
@@ -1049,7 +1049,7 @@ steps:</p>
<div class="highlight"><pre><code class="language-text" data-lang="text">{
"type": "file",
"enabled": true,
- "connection": "hdfs:///",
+ "connection": "hdfs://",
"workspaces": {
"root": {
"location": "/drill/testdata",
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/drill-introduction/index.html
----------------------------------------------------------------------
diff --git a/docs/drill-introduction/index.html b/docs/drill-introduction/index.html
index 4c211c0..f50d6ab 100644
--- a/docs/drill-introduction/index.html
+++ b/docs/drill-introduction/index.html
@@ -1015,7 +1015,8 @@ with existing Apache Hive and Apache HBase deployments. </p>
<ul>
<li><a href="/docs/sql-window-functions">SQL window functions</a></li>
<li><a href="">Automatic partitioning</a> using the new <a href="/docs/partition-by-clause">PARTITION BY</a> clause in the CTAS command</li>
-<li>[User impersonation with Hive authorization](()</li>
+<li>[Delegated Hive impersonation]((/docs/configuring-user-impersonation-with-hive-authorization/)</li>
+<li>Support for UNION and UNION ALL and better optimized plans that include UNION.</li>
</ul>
<h2 id="what's-new-in-apache-drill-1.0">What's New in Apache Drill 1.0</h2>
@@ -1031,7 +1032,7 @@ with existing Apache Hive and Apache HBase deployments. </p>
<li>Support for a new storage plugin input format: <a href="http://avro.apache.org/docs/current/spec.html">Avro</a></li>
</ul>
-<p>In this release, Drill disables the DECIMAL data type, including casting to DECIMAL and reading DECIMAL types from Parquet and Hive. You can <a href="docs/supported-data-types/#enabling-the-decimal-type">enable the DECIMAL type</a>, but this is not recommented.</p>
+<p>In this release, Drill disables the DECIMAL data type, including casting to DECIMAL and reading DECIMAL types from Parquet and Hive. You can <a href="docs/supported-data-types/#enabling-the-decimal-type">enable the DECIMAL type</a>, but this is not recommended.</p>
<h2 id="apache-drill-key-features">Apache Drill Key Features</h2>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/hive-storage-plugin/index.html
----------------------------------------------------------------------
diff --git a/docs/hive-storage-plugin/index.html b/docs/hive-storage-plugin/index.html
index 08bb1a2..759c07c 100644
--- a/docs/hive-storage-plugin/index.html
+++ b/docs/hive-storage-plugin/index.html
@@ -1025,58 +1025,79 @@ in the Drill Web UI to configure a connection to Drill.</p>
<div class="admonition note">
<p class="first admonition-title">Note</p>
<p class="last">Verify that the Hive metastore service is running before you register the Hive metastore. </p>
-</div>
+</div>
<p>To register a remote Hive metastore with Drill, complete the following steps:</p>
<ol>
-<li><p>Issue the following command to start the Hive metastore service on the system specified in the <code>hive.metastore.uris</code>:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">hive --service metastore
-</code></pre></div></li>
-<li><p>Navigate to <a href="http://localhost:8047/">http://localhost:8047</a>, and select the <strong>Storage</strong> tab.</p></li>
-<li><p>In the disabled storage plugins section, click <strong>Update</strong> next to the <code>hive</code> instance.</p></li>
-<li><p>In the configuration window, add the <code>Thrift URI</code> and port to <code>hive.metastore.uris</code>.</p>
-
-<p><strong>Example</strong></p>
+<li>Issue the following command to start the Hive metastore service on the system specified in the <code>hive.metastore.uris</code>:
+<code>hive --service metastore</code></li>
+<li>Navigate to <code>http://<host>:8047</code>, and select the <strong>Storage</strong> tab.</li>
+<li><p>In the disabled storage plugins section, click <strong>Update</strong> next to the <code>hive</code> instance.</p>
<div class="highlight"><pre><code class="language-text" data-lang="text">{
"type": "hive",
- "enabled": true,
+ "enabled": false,
"configProps": {
- "hive.metastore.uris": "thrift://<localhost>:<port>",
+ "hive.metastore.uris": "",
+ "javax.jdo.option.ConnectionURL": "jdbc:derby:;databaseName=../sample-data/drill_hive_db;create=true",
+ "hive.metastore.warehouse.dir": "/tmp/drill_hive_wh",
+ "fs.default.name": "file:///",
"hive.metastore.sasl.enabled": "false"
}
-}
+}
</code></pre></div></li>
-<li><p>Click <strong>Enable</strong>.</p></li>
+<li><p>In the configuration window, add the <code>Thrift URI</code> and port to <code>hive.metastore.uris</code>. </p>
+
+<p><strong>Example</strong></p>
+<div class="highlight"><pre><code class="language-text" data-lang="text"> ...
+ "configProps": {
+ "hive.metastore.uris": "thrift://<host>:<port>",
+ ...
+</code></pre></div></li>
+<li><p>Change the default location of files to suit your environment, for example, change <code>"fs.default.name": "file:///"</code> to one of these locations:</p>
+
+<ul>
+<li><code>hdfs://</code></li>
+<li><code>hdfs://<authority>:<port></code></li>
+</ul></li>
+<li><p>If you are running Drill and Hive in a secure MapR cluster, remove the following line from the configuration:<br>
+<code>"hive.metastore.sasl.enabled" : "false"</code></p></li>
+<li><p>Click <strong>Enable</strong>. </p></li>
+<li><p>If you are running Drill and Hive in a secure MapR cluster, add the following line to <code><DRILL_HOME>/conf/drill-env.sh</code> on each Drill node and then <a href="/docs/starting-drill-in-distributed-mode/">restart the Drillbit service</a>:<br>
+<code>export DRILL_JAVA_OPTS="$DRILL_JAVA_OPTS -Dmapr_sec_enabled=true -Dhadoop.login=maprsasl -Dzookeeper.saslprovider=com.mapr.security.maprsasl.MaprSaslProvider -Dmapr.library.flatclass"</code></p></li>
</ol>
-<p>Once you have configured a storage plugin instance for a Hive data source, you
-can <a href="/docs/querying-hive/">query Hive tables</a>.</p>
+<p>After configuring a Hive storage plugin, you can <a href="/docs/querying-hive/">query Hive tables</a>.</p>
<h2 id="hive-embedded-metastore">Hive Embedded Metastore</h2>
-<p>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 <code>/<drill installation directory>/lib/.</code> If the driver is not there, copy the driver to <code>/<drill
+<p>In this configuration, the Hive metastore is embedded within the Drill process. Configure an embedded metastore only in a cluster that runs a single Drillbit and only for testing purposes. Do not embed the Hive metastore in production systems.</p>
+
+<p>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 <code>/<drill installation directory>/lib/.</code> If the driver is not there, copy the driver to <code>/<drill
installation directory>/lib</code> on the Drill node. For more information about storage types and configurations, refer to <a href="https://cwiki.apache.org/confluence/display/Hive/AdminManual+MetastoreAdmin">"Hive Metastore Administration"</a>.</p>
<p>To register an embedded Hive metastore with Drill, complete the following
steps:</p>
<ol>
-<li>Navigate to <a href="http://localhost:8047/">http://localhost:8047</a>, and select the <strong>Storage</strong> tab</li>
+<li>Navigate to <code>http://<host>:8047</code>, and select the <strong>Storage</strong> tab.</li>
<li>In the disabled storage plugins section, click <strong>Update</strong> next to <code>hive</code> instance.</li>
<li><p>In the configuration window, add the database configuration settings.</p>
<p><strong>Example</strong></p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">{
- "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:///",
+<div class="highlight"><pre><code class="language-text" data-lang="text"> {
+ "type": "hive",
+ "enabled": false,
+ "configProps": {
+ "hive.metastore.uris": "",
+ "javax.jdo.option.ConnectionURL": "jdbc:<database>://<host:port>/<metastore database>",
+ "hive.metastore.warehouse.dir": "/tmp/drill_hive_wh",
+ "fs.default.name": "file:///",
+ "hive.metastore.sasl.enabled": "false"
+ }
}
-}
</code></pre></div></li>
+<li><p>Change the <code>"fs.default.name":</code> attribute to specify the default location of files. The value needs to be a URI that is available and capable of handling filesystem requests. For example, change the local file system URI <code>"file:///"</code> to the HDFS URI: <code>hdfs://</code>, or to the path on HDFS with a namenode: <code>hdfs://<authority>:<port></code></p></li>
<li><p>Click <strong>Enable</strong>.</p></li>
</ol>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/hive-to-drill-data-type-mapping/index.html
----------------------------------------------------------------------
diff --git a/docs/hive-to-drill-data-type-mapping/index.html b/docs/hive-to-drill-data-type-mapping/index.html
index bf81997..9a289e6 100644
--- a/docs/hive-to-drill-data-type-mapping/index.html
+++ b/docs/hive-to-drill-data-type-mapping/index.html
@@ -1023,7 +1023,7 @@
<td>TRUE (1) or FALSE (0)</td>
</tr>
<tr>
-<td>CHAR</td>
+<td>VARCHAR</td>
<td>CHAR</td>
<td>Character string, fixed-length max 255</td>
</tr>
@@ -1048,9 +1048,9 @@
<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>
+<td>INTEGER</td>
+<td>INT, TINYINT, SMALLINT</td>
+<td>1-, 2-, or 4-byte signed integer</td>
</tr>
<tr>
<td>INTERVALDAY</td>
@@ -1063,11 +1063,6 @@
<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>
@@ -1092,6 +1087,11 @@
<td>VARCHAR</td>
<td>Character string variable length</td>
</tr>
+<tr>
+<td>VARBINARY</td>
+<td>BINARY</td>
+<td>Binary string</td>
+</tr>
</tbody></table>
<p>* In this release, Drill disables the DECIMAL data type, including casting to DECIMAL and reading DECIMAL types from Parquet and Hive. To enable the DECIMAL type, set the <code>planner.enable_decimal_data_type</code> option to <code>true</code>.</p>
@@ -1151,17 +1151,7 @@ Time taken: 0.524 seconds, Fetched: 1 row(s)
</code></pre></div>
<h3 id="connect-drill-to-hive-and-query-the-data">Connect Drill to Hive and Query the Data</h3>
-<p>In Drill, you use the Hive storage plugin that has the following definition.</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">{
- "type": "hive",
- "enabled": true,
- "configProps": {
- "hive.metastore.uris": "thrift://localhost:9083",
- "hive.metastore.sasl.enabled": "false"
- }
-}
-</code></pre></div>
-<p>Using the Hive storage plugin connects Drill to the Hive metastore containing the data.</p>
+<p>In Drill, you use the <a href="/docs/hive-storage-plugin">Hive storage plugin</a>. Using the Hive storage plugin connects Drill to the Hive metastore containing the data.</p>
<div class="highlight"><pre><code class="language-text" data-lang="text">0: jdbc:drill:> USE hive;
+------------+------------+
| ok | summary |
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/installing-drill-on-linux-and-mac-os-x/index.html
----------------------------------------------------------------------
diff --git a/docs/installing-drill-on-linux-and-mac-os-x/index.html b/docs/installing-drill-on-linux-and-mac-os-x/index.html
index 0dc2a4e..8108046 100644
--- a/docs/installing-drill-on-linux-and-mac-os-x/index.html
+++ b/docs/installing-drill-on-linux-and-mac-os-x/index.html
@@ -1008,8 +1008,8 @@
<p>Complete the following steps to install Drill: </p>
<ol>
-<li><p>In a terminal windows, change to the directory where you want to install Drill.</p></li>
-<li><p>To download the latest version of Apache Drill, download Drill from the <a href="http://getdrill.org/drill/download/apache-drill-1.1.0.tar.gz">Drill web site</a> or run one of the following commands, depending on which you have installed on your system: </p>
+<li><p>In a terminal window, change to the directory where you want to install Drill.</p></li>
+<li><p>To get the latest version of Apache Drill, download Drill from the <a href="http://getdrill.org/drill/download/apache-drill-1.1.0.tar.gz">Drill web site</a> or run one of the following commands, depending on which you have installed on your system: </p>
<ul>
<li><code>wget http://getdrill.org/drill/download/apache-drill-1.1.0.tar.gz</code><br></li>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/installing-the-driver-on-linux/index.html
----------------------------------------------------------------------
diff --git a/docs/installing-the-driver-on-linux/index.html b/docs/installing-the-driver-on-linux/index.html
index 8d8cfc1..dc956ae 100644
--- a/docs/installing-the-driver-on-linux/index.html
+++ b/docs/installing-the-driver-on-linux/index.html
@@ -1049,15 +1049,11 @@ Example: <code>127.0.0.1 localhost</code></p></li>
<h2 id="step-1:-download-the-mapr-drill-odbc-driver">Step 1: Download the MapR Drill ODBC Driver</h2>
-<p>Download either the 32- or 64-bit driver from the following sites:</p>
+<p>Download either the 32- or 64-bit driver:</p>
<ul>
-<li><p>[MapR Drill ODBC Driver (32-bit)]</p>
-
-<p><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.0.0.1001/MapRDrillODBC-32bit-1.0.0.i686.rpm">http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.0.0.1001/MapRDrillODBC-32bit-1.0.0.i686.rpm</a></p></li>
-<li><p>[MapR Drill ODBC Driver (64-bit)]</p>
-
-<p><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.0.0.1001/MapRDrillODBC-1.0.0.x86_64.rpm">http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.0.0.1001/MapRDrillODBC-1.0.0.x86_64.rpm</a></p></li>
+<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.1.0.1000/MapRDrillODBC-32bit-1.1.0.i686.rpm">MapR Drill ODBC Driver (32-bit)</a></li>
+<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.1.0.1000/MapRDrillODBC-1.1.0.x86_64.rpm">MapR Drill ODBC Driver (64-bit)</a></li>
</ul>
<h2 id="step-2:-install-the-mapr-drill-odbc-driver">Step 2: Install the MapR Drill ODBC Driver</h2>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/installing-the-driver-on-mac-os-x/index.html
----------------------------------------------------------------------
diff --git a/docs/installing-the-driver-on-mac-os-x/index.html b/docs/installing-the-driver-on-mac-os-x/index.html
index aa61346..5584940 100644
--- a/docs/installing-the-driver-on-mac-os-x/index.html
+++ b/docs/installing-the-driver-on-mac-os-x/index.html
@@ -1036,7 +1036,7 @@ Example: <code>127.0.0.1 localhost</code></p></li>
<p>Click the following link to download the driver: </p>
-<p><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.0.0.1001/MapRDrillODBC.dmg">MapR Drill ODBC Driver for Mac</a></p>
+<p><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.1.0.1000/MapRDrillODBC.dmg">MapR Drill ODBC Driver for Mac</a></p>
<hr>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/installing-the-driver-on-windows/index.html
----------------------------------------------------------------------
diff --git a/docs/installing-the-driver-on-windows/index.html b/docs/installing-the-driver-on-windows/index.html
index 7caec43..10d434c 100644
--- a/docs/installing-the-driver-on-windows/index.html
+++ b/docs/installing-the-driver-on-windows/index.html
@@ -1046,8 +1046,8 @@ Example: <code>127.0.0.1 localhost</code></p></li>
<p>Download the installer that corresponds to the bitness of the client application from which you want to create an ODBC connection:</p>
<ul>
-<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.0.0.1001/MapRDrillODBC32.msi">MapR Drill ODBC Driver (32-bit)</a><br></li>
-<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.0.0.1001/MapRDrillODBC64.msi">MapR Drill ODBC Driver (64-bit)</a></li>
+<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.1.0.1000/MapRDrillODBC32.msi">MapR Drill ODBC Driver (32-bit)</a><br></li>
+<li><a href="http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.1.0.1000/MapRDrillODBC64.msi">MapR Drill ODBC Driver (64-bit)</a></li>
</ul>
<hr>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/mongodb-plugin-for-apache-drill/index.html
----------------------------------------------------------------------
diff --git a/docs/mongodb-plugin-for-apache-drill/index.html b/docs/mongodb-plugin-for-apache-drill/index.html
index c59b5d2..61810fa 100644
--- a/docs/mongodb-plugin-for-apache-drill/index.html
+++ b/docs/mongodb-plugin-for-apache-drill/index.html
@@ -1003,7 +1003,7 @@
<h2 id="overview">Overview</h2>
-<p>Drill provides a mongodb format plugin to connect to MongoDB, and run queries
+<p>Drill supports MongoDB 3.0, providing a mongodb format plugin to connect to MongoDB using MongoDB's latest Java driver. You can run queries
to read, but not write, the Mongo data using Drill. Attempting to write data back to Mongo results in an error. You do not need any upfront schema definitions. </p>
<div class="admonition note">
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/plugin-configuration-basics/index.html
----------------------------------------------------------------------
diff --git a/docs/plugin-configuration-basics/index.html b/docs/plugin-configuration-basics/index.html
index 8a4af5f..632b871 100644
--- a/docs/plugin-configuration-basics/index.html
+++ b/docs/plugin-configuration-basics/index.html
@@ -1052,7 +1052,7 @@ name. Names are case-sensitive.</li>
</tr>
<tr>
<td>"connection"</td>
- <td>"classpath:///"<br>"file:///"<br>"mongodb://localhost:27017/"<br>"hdfs:///"</td>
+ <td>"classpath:///"<br>"file:///"<br>"mongodb://localhost:27017/"<br>"hdfs://"</td>
<td>implementation-dependent</td>
<td>Type of distributed file system, such as HDFS, Amazon S3, or files in your file system.</td>
</tr>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/querying-the-information-schema/index.html
----------------------------------------------------------------------
diff --git a/docs/querying-the-information-schema/index.html b/docs/querying-the-information-schema/index.html
index 51e3cdc..a09ba35 100644
--- a/docs/querying-the-information-schema/index.html
+++ b/docs/querying-the-information-schema/index.html
@@ -1107,7 +1107,7 @@ WHERE TABLE_NAME = 'Orders' AND TABLE_SCHEMA = 'HiveTest.SalesDB'
| OrderTotal | Decimal |
+-------------+------------+
</code></pre></div>
-<p>In this release, Drill disables the DECIMAL data type, including casting to DECIMAL and reading DECIMAL types from Parquet and Hive. You can <a href="docs/supported-data-types/#enabling-the-decimal-type">enable the DECIMAL type</a>, but this is not recommented.</p>
+<p>In this release, Drill disables the DECIMAL data type, including casting to DECIMAL and reading DECIMAL types from Parquet and Hive. You can <a href="docs/supported-data-types/#enabling-the-decimal-type">enable the DECIMAL type</a>, but this is not recommended.</p>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/select/index.html
----------------------------------------------------------------------
diff --git a/docs/select/index.html b/docs/select/index.html
index aa936e5..c4e83a9 100644
--- a/docs/select/index.html
+++ b/docs/select/index.html
@@ -1012,7 +1012,7 @@
<li>WHERE clause</li>
<li>GROUP BY clause</li>
<li>HAVING clause</li>
-<li>UNION ALL set operator</li>
+<li>UNION and UNION ALL set operators</li>
<li>ORDER BY clause (with an optional LIMIT clause)</li>
<li>Limit clause</li>
<li>Offset clause</li>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/docs/union-set-operator/index.html
----------------------------------------------------------------------
diff --git a/docs/union-set-operator/index.html b/docs/union-set-operator/index.html
index c335f2a..a98c355 100644
--- a/docs/union-set-operator/index.html
+++ b/docs/union-set-operator/index.html
@@ -1027,7 +1027,7 @@
<li>You must explicitly specify columns.</li>
</ul>
-<h2 id="examples">Examples</h2>
+<h2 id="example">Example</h2>
<p>The following example uses the UNION ALL set operator to combine click activity data before and after a marketing campaign. The data in the example exists in the <code>dfs.clicks workspace</code>.</p>
<div class="highlight"><pre><code class="language-text" data-lang="text"> 0: jdbc:drill:> SELECT t.trans_id transaction, t.user_info.cust_id customer
http://git-wip-us.apache.org/repos/asf/drill-site/blob/94a79d4e/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index 9d6aecc..3e6c72f 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
</description>
<link>/</link>
<atom:link href="/feed.xml" rel="self" type="application/rss+xml"/>
- <pubDate>Tue, 07 Jul 2015 16:34:15 -0700</pubDate>
- <lastBuildDate>Tue, 07 Jul 2015 16:34:15 -0700</lastBuildDate>
+ <pubDate>Tue, 07 Jul 2015 18:15:20 -0700</pubDate>
+ <lastBuildDate>Tue, 07 Jul 2015 18:15:20 -0700</lastBuildDate>
<generator>Jekyll v2.5.2</generator>
<item>