drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bridg...@apache.org
Subject drill git commit: 0.8 updates per NR
Date Thu, 02 Apr 2015 01:46:59 GMT
Repository: drill
Updated Branches:
  refs/heads/gh-pages 81be4bc98 -> ae5c73563


0.8 updates per NR


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

Branch: refs/heads/gh-pages
Commit: ae5c73563e1f991c5cfd2abe7dc6e6f12e7e4485
Parents: 81be4bc
Author: Kristine Hahn <khahn@maprtech.com>
Authored: Wed Apr 1 18:25:51 2015 -0700
Committer: Bridget Bevens <bbevens@maprtech.com>
Committed: Wed Apr 1 18:41:13 2015 -0700

----------------------------------------------------------------------
 _docs/008-sql-ref.md                            |  12 ++
 _docs/img/connect-plugin.png                    | Bin 24774 -> 36731 bytes
 .../odbc-linux/001-install-odbc-linux.md        |   4 +-
 .../odbc-linux/002-install-odbc-mac.md          |   2 +-
 .../interfaces/odbc-win/001-install-odbc-win.md |   4 +-
 _docs/rn/004-0.6.0-rn.md                        |   2 +-
 _docs/rn/005-0.7.0-rn.md                        |   2 +-
 _docs/rn/006-0.8.0-rn.md                        |  28 +++
 _docs/sql-ref/data-types/001-date.md            |   6 +-
 _docs/sql-ref/functions/002-data-type-fmt.md    | 198 +++++++++++++++++--
 _includes/menu.html                             |   2 +-
 overview.html                                   |  12 +-
 12 files changed, 236 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/_docs/008-sql-ref.md
----------------------------------------------------------------------
diff --git a/_docs/008-sql-ref.md b/_docs/008-sql-ref.md
old mode 100644
new mode 100755
index 61dd988..1945467
--- a/_docs/008-sql-ref.md
+++ b/_docs/008-sql-ref.md
@@ -12,3 +12,15 @@ access, regardless of its source system or its schema and data types. The
 sweet spot for Apache Drill is a SQL query workload against *complex data*:
 data made up of various types of records and fields, rather than data in a
 recognizable relational form (discrete rows and columns).
+
+For more information about SQL for Drill, see:
+
+- [Data Types](http://drill.apache.org/docs/data-types/)
+- [Lexical Structure](http://drill.apache.org/docs/lexical-structure/)
+- [Operators](http://drill.apache.org/docs/operators/)
+- [SQL Functions](http://drill.apache.org/docs/sql-functions/)
+- [Nested Data Functions](http://drill.apache.org/docs/nested-data-functions/)
+- [SQL Commands Summary](http://drill.apache.org/docs/sql-commands-summary/)
+- [Reserved Key Words](http://drill.apache.org/docs/reserved-keywords/)
+- [SQL Extensions](http://drill.apache.org/docs/sql-extensions/)
+

http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/_docs/img/connect-plugin.png
----------------------------------------------------------------------
diff --git a/_docs/img/connect-plugin.png b/_docs/img/connect-plugin.png
index d47bee3..db3a3ec 100644
Binary files a/_docs/img/connect-plugin.png and b/_docs/img/connect-plugin.png differ

http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/_docs/interfaces/odbc-linux/001-install-odbc-linux.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/odbc-linux/001-install-odbc-linux.md b/_docs/interfaces/odbc-linux/001-install-odbc-linux.md
old mode 100644
new mode 100755
index 61644d8..9b995b2
--- a/_docs/interfaces/odbc-linux/001-install-odbc-linux.md
+++ b/_docs/interfaces/odbc-linux/001-install-odbc-linux.md
@@ -42,8 +42,8 @@ To install the driver, you need Administrator privileges on the computer.
 
 Click on a link below to download the driver:
 
-  * [MapRDrillODBC-32bit-0.07.0.i686.rpm](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC-32bit-0.07.0.i686.rpm)
(32-bit)
-  * [MapRDrillODBC-0.07.0.x86_64.rpm](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC-0.07.0.x86_64.rpm)
(64-bit)
+  * [MapR Drill ODBC Driver (32-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v0.08.1.0618/MapRDrillODBC-32bit-0.08.1.i686_DriverOnly.rpm)
+  * [MapR Drill ODBC Driver (64-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v0.08.1.0618/MapRDrillODBC-0.08.1.x86_64_DriverOnly.rpm)
 
 ## Step 2: Installing the MapR Drill ODBC Driver
 

http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/_docs/interfaces/odbc-linux/002-install-odbc-mac.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/odbc-linux/002-install-odbc-mac.md b/_docs/interfaces/odbc-linux/002-install-odbc-mac.md
old mode 100644
new mode 100755
index 77b8e1b..f5966a5
--- a/_docs/interfaces/odbc-linux/002-install-odbc-mac.md
+++ b/_docs/interfaces/odbc-linux/002-install-odbc-mac.md
@@ -33,7 +33,7 @@ To install the driver, you need Administrator privileges on the computer.
 
 Click the following link to download the driver:
 
-  * [MapRDrillODBC.dmg](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC.dmg)
+  * [MapR Drill ODBC Driver for Mac](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v0.08.1.0618/MapRDrillODBC_DriverOnly.dmg)
 
 ## Step 2: Installing the MapR Drill ODBC Driver
 

http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/_docs/interfaces/odbc-win/001-install-odbc-win.md
----------------------------------------------------------------------
diff --git a/_docs/interfaces/odbc-win/001-install-odbc-win.md b/_docs/interfaces/odbc-win/001-install-odbc-win.md
old mode 100644
new mode 100755
index 7ff770d..98cc881
--- a/_docs/interfaces/odbc-win/001-install-odbc-win.md
+++ b/_docs/interfaces/odbc-win/001-install-odbc-win.md
@@ -27,8 +27,8 @@ To install the driver, you need Administrator privileges on the computer.
 ## Installing the Driver
 
   1. Download the installer that corresponds to the bitness of the client application from
which you want to create an ODBC connection:
-     * [MapRDrillODBC32.msi](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC32.msi)
(32-bit)
-     * [MapRDrillODBC64.msi](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc/MapRDrillODBC64.msi)
(64-bit)
+     * [MapR Drill ODBC Driver (32-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v0.08.1.0618/MapRDrillODBC32.msi)
+     * [MapR Drill ODBC Driver (64-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v0.08.1.0618/MapRDrillODBC64.msi)
   2. Double-click the installer from the location where you downloaded it.
   3. Click **Next.**
   4. Select the check box to accept the terms of the License Agreement and click **Next**.

http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/_docs/rn/004-0.6.0-rn.md
----------------------------------------------------------------------
diff --git a/_docs/rn/004-0.6.0-rn.md b/_docs/rn/004-0.6.0-rn.md
old mode 100644
new mode 100755
index 28111f0..83ad047
--- a/_docs/rn/004-0.6.0-rn.md
+++ b/_docs/rn/004-0.6.0-rn.md
@@ -1,5 +1,5 @@
 ---
-title: "Apache Drill 0.6.0 Release Notes (Apache Drill Alpha)"
+title: "Apache Drill 0.6.0 Release Notes"
 parent: "Release Notes"
 ---
 Apache Drill 0.6.0, the second beta release for Drill, is designed to help

http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/_docs/rn/005-0.7.0-rn.md
----------------------------------------------------------------------
diff --git a/_docs/rn/005-0.7.0-rn.md b/_docs/rn/005-0.7.0-rn.md
old mode 100644
new mode 100755
index e25a58a..00c0f05
--- a/_docs/rn/005-0.7.0-rn.md
+++ b/_docs/rn/005-0.7.0-rn.md
@@ -1,5 +1,5 @@
 ---
-title: "Apache Drill 0.7.0 Release Notes (Apache Drill Alpha)"
+title: "Apache Drill 0.7.0 Release Notes"
 parent: "Release Notes"
 ---
 Apache Drill 0.7.0, the third beta release for Drill, is designed to help

http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/_docs/rn/006-0.8.0-rn.md
----------------------------------------------------------------------
diff --git a/_docs/rn/006-0.8.0-rn.md b/_docs/rn/006-0.8.0-rn.md
new file mode 100755
index 0000000..55e4eab
--- /dev/null
+++ b/_docs/rn/006-0.8.0-rn.md
@@ -0,0 +1,28 @@
+---
+title: "Apache Drill 0.8.0 Release Notes"
+parent: "Release Notes"
+---
+Apache Drill 0.8.0, continues the Drill release cycle as we drive towards general availability.
+This release includes [243 resolved JIRAs](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12313820&version=12328812)
and numerous enhancements.
+
+This release is available as
+[binary](http://www.apache.org/dyn/closer.cgi/drill/drill-0.8.0/apache-drill-0.8.0.tar.gz)
and
+[source](http://www.apache.org/dyn/closer.cgi/drill/drill-0.8.0/apache-drill-0.8.0-src.tar.gz)
tarballs that are compiled against Apache Hadoop.
+Drill has been tested against MapR, Cloudera, and Hortonworks Hadoop
+distributions. There are associated build profiles and JIRAs that can help you
+run Drill against your preferred distribution
+
+Apache Drill 0.8.0 Key Features:
+
+- **Bytecode rewriting**. Drill now leverages code optimization techniques such as bytecode
rewriting and inlining to enhance the speed of many queries by reducing overall memory usage
and CPU instructions.
+- **Advanced partition pruning**. Drill can now prune partitions based on arbitrarily complex
expressions. For example, specify WHERE dir0 LIKE '2015-%' and your query will look inside
the directory "2015-01" but not inside "2014-12".
+- **Real-time query diagnostics**. You can now see exactly what your queries are doing in
real-time, making it easy to troubleshoot, optimize and manage execution.
+- **Large records, large # of files**. Drill was previously limited to small records of up
to 128KB. It now supports records of any size. In addition, query performance has been improved
when dealing with large numbers of files thanks to a variety of optimizations such as parallel
metadata reads.
+- **More SQL**. Drill now features complete support for UNION ALL and COUNT(DISTINCT). Drill
0.8 also includes new functions such as unix_timestamp and the window functions sum, count
and rank. Note that these window functions should be considered beta.
+- **Better compression**. Drill can now query compressed JSON files. In addition, the user
can control Parquet compression in CTAS (CREATE TABLE AS) statements.
+- **Performance**. Drill 0.8 includes broadcast joins, disk-based joins, parallel metadata
reads and many other performance-related enhancements.
+- 	**Reliability**. Drill 0.8 includes a variety of fixes that improve the stability of the
drillbit daemon, the sqlline shell and the ODBC and JDBC drivers.
+- 	**HBase 0.98 support**. You can now run SQL queries on any HBase 0.98 table.
+
+
+

http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/_docs/sql-ref/data-types/001-date.md
----------------------------------------------------------------------
diff --git a/_docs/sql-ref/data-types/001-date.md b/_docs/sql-ref/data-types/001-date.md
index 8e3b53c..12dc8c2 100644
--- a/_docs/sql-ref/data-types/001-date.md
+++ b/_docs/sql-ref/data-types/001-date.md
@@ -75,7 +75,7 @@ You can run the dummy query described earlier to check the formatting of
the fie
     +------------+
     1 row selected (0.054 seconds)
 
-    SELECT INTERVAL '1-2' year to month FROM dfs.`/Users/khahn/drill/apache-drill-0.8.0-SNAPSHOT/dummy.json`;
+    SELECT INTERVAL '1-2' year to month FROM dfs.`/Users/drill/dummy.json`;
     +------------+
     |   EXPR$0   |
     +------------+
@@ -83,7 +83,7 @@ You can run the dummy query described earlier to check the formatting of
the fie
     +------------+
     1 row selected (0.927 seconds)
 
-    SELECT INTERVAL '1' year FROM dfs.`/Users/khahn/drill/apache-drill-0.8.0-SNAPSHOT/dummy.json`;
+    SELECT INTERVAL '1' year FROM dfs.`/Users/drill/dummy.json`;
     +------------+
     |   EXPR$0   |
     +------------+
@@ -91,7 +91,7 @@ You can run the dummy query described earlier to check the formatting of
the fie
     +------------+
     1 row selected (0.088 seconds)
 
-    SELECT INTERVAL '13' month FROM dfs.`/Users/khahn/drill/apache-drill-0.8.0-SNAPSHOT/dummy.json`;
+    SELECT INTERVAL '13' month FROM dfs.`/Users/drill/dummy.json`;
     +------------+
     |   EXPR$0   |
     +------------+

http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/_docs/sql-ref/functions/002-data-type-fmt.md
----------------------------------------------------------------------
diff --git a/_docs/sql-ref/functions/002-data-type-fmt.md b/_docs/sql-ref/functions/002-data-type-fmt.md
index 5ebfec2..d09f447 100644
--- a/_docs/sql-ref/functions/002-data-type-fmt.md
+++ b/_docs/sql-ref/functions/002-data-type-fmt.md
@@ -150,7 +150,8 @@ In addition to the CAST, CONVERT_TO, and CONVERT_FROM functions, Drill
supports
 * A character string to a date
 * A character string to a number
 * A character string to a timestamp with time zone
-* A decimal type to a timestamp with time zone
+
+<!-- A decimal type to a timestamp with time zone -->
 
 ## Usage Notes
 
@@ -213,9 +214,148 @@ Use the following format specifiers for numerical conversions:
               itself, use two in a row: <code>"# o''clock"</code>.
  </table>
 
-Use the following format specifiers for data type conversions:
-
-
+Use the following format specifiers for date/time conversions:
+
+<table>
+  <tr>
+    <th>Symbol</th>
+    <th>Meaning</th>
+    <th>Presentation</th>
+    <th>Examples</th>
+  </tr>
+  <tr>
+    <td>G</td>
+    <td>era</td>
+    <td>text</td>
+    <td>AD</td>
+  </tr>
+  <tr>
+    <td>C</td>
+    <td>century of era (&gt;=0)</td>
+    <td>number</td>
+    <td>20</td>
+  </tr>
+  <tr>
+    <td>Y</td>
+    <td>year of era (&gt;=0)</td>
+    <td>year</td>
+    <td>1996</td>
+  </tr>
+  <tr>
+    <td>x</td>
+    <td>weekyear</td>
+    <td>year</td>
+    <td>1996</td>
+  </tr>
+  <tr>
+    <td>w</td>
+    <td>week of weekyear</td>
+    <td>number</td>
+    <td>27</td>
+  </tr>
+  <tr>
+    <td>e</td>
+    <td>day of week</td>
+    <td>number</td>
+    <td>2</td>
+  </tr>
+  <tr>
+    <td>E</td>
+    <td>day of week</td>
+    <td>text</td>
+    <td>Tuesday; Tue</td>
+  </tr>
+  <tr>
+    <td>y</td>
+    <td>year</td>
+    <td>year</td>
+    <td>1996</td>
+  </tr>
+  <tr>
+    <td>D</td>
+    <td>day of year</td>
+    <td>number</td>
+    <td>189</td>
+  </tr>
+  <tr>
+    <td>M</td>
+    <td>month of year</td>
+    <td>month</td>
+    <td>July; Jul; 07</td>
+  </tr>
+  <tr>
+    <td>d</td>
+    <td>day of month</td>
+    <td>number</td>
+    <td>10</td>
+  </tr>
+  <tr>
+    <td>a</td>
+    <td>halfday of day</td>
+    <td>text</td>
+    <td>PM</td>
+  </tr>
+  <tr>
+    <td>K</td>
+    <td>hour of halfday (0~11)</td>
+    <td>number</td>
+    <td>0</td>
+  </tr>
+  <tr>
+    <td>h</td>
+    <td>clockhour of halfday (1~12)number</td>
+    <td>12</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>H</td>
+    <td>hour of day (0~23)</td>
+    <td>number</td>
+    <td>0</td>
+  </tr>
+  <tr>
+    <td>k</td>
+    <td>clockhour of day (1~24)</td>
+    <td>number</td>
+    <td>24</td>
+  </tr>
+  <tr>
+    <td>m</td>
+    <td>minute of hour</td>
+    <td>number</td>
+    <td>30</td>
+  </tr>
+  <tr>
+    <td>s</td>
+    <td>second of minute</td>
+    <td>number</td>
+    <td>55</td>
+  </tr>
+  <tr>
+    <td>S</td>
+    <td>fraction of second</td>
+    <td>number</td>
+    <td>978</td>
+  </tr>
+  <tr>
+    <td>z</td>
+    <td>time zone</td>
+    <td>text</td>
+    <td>Pacific Standard Time; PST</td>
+  </tr>
+  <tr>
+    <td>Z</td>
+    <td>time zone offset/id</td>
+    <td>zone</td>
+    <td>-0800; -08:00; America/Los_Angeles</td>
+  </tr>
+  <tr>
+    <td>escape for text delimiter   '</td>
+    <td>single quote</td>
+    <td>literal</td>
+    <td></td>
+  </tr>
+</table>
 
 For more information about specifying a format, refer to one of the following format specifier
documents:
 
@@ -232,18 +372,10 @@ TO_CHAR converts a date, time, timestamp, or numerical expression to
a character
 
 *expression* is a float, integer, decimal, date, time, or timestamp expression. 
 
-* 'format'* is format specifier enclosed in single quotation marks that sets a pattern for
the output formatting. 
+*'format'* is format specifier enclosed in single quotation marks that sets a pattern for
the output formatting. 
 
 ### Usage Notes
-Currently Drill does not support a timestamp with time zone data type. Drill stores the timestamp
and date in [UTC](http://www.timeanddate.com/time/aboututc.html) and maintains no timezone
information. Currently, you cannot convert dates/timestamp to a specific timezone. However
if your input data contains timezone information, Drill can use it as if it were UTC time.
-
-SELECT to_char(cast('2008-2-23 12:00:00 America/Los_Angeles' as timestamp), 'yyyy MMM dd
HH:mm:ss z') FROM dfs.`/Users/drill/dummy.json`;
-    +------------+
-    |   EXPR$0   |
-    +------------+
-    | 2008 Feb 23 12:00:00 UTC |
-    +------------+
-    1 row selected (0.108 seconds)
+Currently Drill does not support a timestamp with time zone data type. Drill stores the timestamp
and date in [UTC](http://www.timeanddate.com/time/aboututc.html) and maintains no timezone
information. Currently, you cannot convert dates/timestamp to a specific timezone. However
if your input data contains timezone information, Drill can use it as if it were UTC time.

 
 ## Examples
 
@@ -303,7 +435,7 @@ Converts a character string or a UNIX epoch timestamp to a date.
 
     TO_DATE (expression [, 'format']);
 
-*expression* is a character string enclosed in single quotation marks or a UNIX epoch timestamp,
not enclosed in single quotation marks. 
+*expression* is a character string enclosed in single quotation marks or a UNIX epoch timestamp
in milliseconds, not enclosed in single quotation marks. 
 
 * 'format'* is format specifier enclosed in single quotation marks that sets a pattern for
the output formatting. Use this option only when the expression is a character string, not
a UNIX epoch timestamp. 
 
@@ -312,7 +444,7 @@ Specify a format using patterns defined in [Java DateTimeFormat class](http://jo
 
 
 ## Examples
-The first example converts a character string to a date. The second example extracts the
year to verify that Drill recognizes the date as a date type.
+The first example converts a character string to a date. The second example extracts the
year to verify that Drill recognizes the date as a date type. 
 
     SELECT TO_DATE('2015-FEB-23', 'yyyy-MMM-dd') FROM dfs.`/Users/drill/dummy.json`;
     +------------+
@@ -331,6 +463,16 @@ The first example converts a character string to a date. The second example
extr
     +------------+
     1 row selected (0.128 seconds)
 
+The following example converts a UNIX epoch timestamp to a date.
+
+    SELECT TO_DATE(1427849046000) FROM dfs.`/Users/drill/dummy.json`;
+    +------------+
+    |   EXPR$0   |
+    +------------+
+    | 2015-04-01 |
+    +------------+
+    1 row selected (0.082 seconds)
+
 # TO_NUMBER
 
 TO_NUMBER converts a character string to a formatted number using a format specification.
@@ -389,7 +531,11 @@ The data type of the output of TO_NUMBER is a numeric. You can use the
following
 
 # TO_TIME
 
-    SELECT to_time('12:20:30', 'HH:mm:ss') FROM dfs.`/Users/khahn/Documents/test_files_source/dummy.json`;
+Converts a character string to a time.
+
+## Examples
+
+    SELECT TO_TIME('12:20:30', 'HH:mm:ss') FROM dfs.`/Users/Drill/test_files_source/dummy.json`;
     +------------+
     |   EXPR$0   |
     +------------+
@@ -397,17 +543,31 @@ The data type of the output of TO_NUMBER is a numeric. You can use the
following
     +------------+
     1 row selected (0.067 seconds)
 
+# TO_TIMESTAMP
 
-    # TO_TIMESTAMP
+Converts a date or Unix Epoch timestamp to a timestamp.
 
-    SELECT to_timestamp('2008-2-23 12:00:00', 'yyyy-MM-dd HH:mm:ss') FROM dfs.`/Users/khahn/Documents/test_files_source/dummy.json`;
+    SELECT to_timestamp('2008-2-23 12:00:00', 'yyyy-MM-dd HH:mm:ss') FROM dfs.`/Users/Drill/dummy.json`;
     +------------+
     |   EXPR$0   |
     +------------+
     | 2008-02-23 12:00:00.0 |
     +------------+
 
+    SELECT to_timestamp(1427936330) FROM dfs.`/Users/drill/dummy.json`;
+    +------------+
+    |   EXPR$0   |
+    +------------+
+    | 2015-04-01 17:58:50.0 |
+    +------------+
+    1 row selected (0.094 seconds)
+
+<!--     FROM Andries
+    select to_timestamp('2015-03-30 20:49:59.0 UTC', 'YYYY-MM-dd HH:mm:ss.s z') as Original,
to_char(to_timestamp('2015-03-30 20:49:59.0 UTC', 'YYYY-MM-dd HH:mm:ss.s z'), 'z') as New_TZ
from sys.version;
 
+    Using ā€˜Zā€™ will provide offset from UTC as opposed to the 3 letter timezone code.
+ -->
+<!-- DRILL-448 Support timestamp with time zone -->
 
 
 <!-- Apache Drill    

http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/_includes/menu.html
----------------------------------------------------------------------
diff --git a/_includes/menu.html b/_includes/menu.html
old mode 100644
new mode 100755
index 82994a9..7ebd0d2
--- a/_includes/menu.html
+++ b/_includes/menu.html
@@ -11,7 +11,7 @@
     <a href="{{ site.baseurl }}/overview/">Documentation</a>
     <ul>
       <li><a href="{{ site.baseurl }}/overview/">Overview&nbsp;&nbsp;&nbsp;&nbsp;</a></li>
-      <li><a href="https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+in+10+Minutes"
target="_blank">Drill in 10 Minutes</a></li>
+      <li><a href="http://drill.apache.org/docs/apache-drill-in-10-minutes/" target="_blank">Drill
in 10 Minutes</a></li>
       <li><a href="{{ site.baseurl }}/why/">Why Drill? &nbsp;&nbsp;&nbsp;&nbsp;</a></li>
       <li><a href="{{ site.baseurl }}/architecture/">Architecture</a></li>
     </ul>

http://git-wip-us.apache.org/repos/asf/drill/blob/ae5c7356/overview.html
----------------------------------------------------------------------
diff --git a/overview.html b/overview.html
index 85d9186..7e6c9ba 100755
--- a/overview.html
+++ b/overview.html
@@ -3,16 +3,16 @@ layout: page
 title: Overview
 ---
   <h2>Complete Drill Documentation</h2>
-  <p><a href="https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+Wiki"
target="_blank">Click here</a></p>
+  <p><a href="http://drill.apache.org/docs/" target="_blank">Click here</a></p>
 
   <h2>Quick Links</h2>
-  <p><a href="https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+in+10+Minutes"
target="_blank">Drill in 10 minutes</a></p>
+  <p><a href="http://drill.apache.org/docs/apache-drill-in-10-minutes/" target="_blank">Drill
in 10 minutes</a></p>
   <p>
-    <a href="https://cwiki.apache.org/confluence/display/DRILL/Connecting+to+Data+Sources#ConnectingtoDataSources-QueryingaFileSystem"
target="_blank">Query Files</a> |
-    <a href="https://cwiki.apache.org/confluence/display/DRILL/Connecting+to+Data+Sources#ConnectingtoDataSources-QueryingHBaseTables"
target="_blank">Query HBase</a> | <a href="https://cwiki.apache.org/confluence/display/DRILL/Connecting+to+Data+Sources#ConnectingtoDataSources-QueryingHiveTables"
target="_blank">Query Hive</a>
+    <a href="http://drill.apache.org/docs/querying-a-file-system/" target="_blank">Query
Files</a> |
+    <a href="http://drill.apache.org/docs/querying-hbase/" target="_blank">Query HBase</a>
| <a href="http://drill.apache.org/docs/querying-hive/" target="_blank">Query Hive</a>
   </p>
-  <p><a href="https://cwiki.apache.org/confluence/display/DRILL/SQL+Overview" target="_blank">SQL
Support</a></p>
-  <p><a href="https://cwiki.apache.org/confluence/display/DRILL/Apache+Drill+Tutorial"
target="_blank">Drill Tutorials</a></p>
+  <p><a href="http://drill.apache.org/docs/sql-reference/" target="_blank">SQL
Support</a></p>
+  <p><a href="http://drill.apache.org/docs/apache-drill-tutorial/" target="_blank">Drill
Tutorials</a></p>
 
   <h2>Videos</h2><br>
   <table>


Mime
View raw message