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/06/10 20:07:59 UTC
drill git commit: add link to dir functions
Repository: drill
Updated Branches:
refs/heads/gh-pages 6fda42323 -> 596e4f95c
add link to dir functions
minor edit
errant url
DRILL-3078
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/596e4f95
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/596e4f95
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/596e4f95
Branch: refs/heads/gh-pages
Commit: 596e4f95c1f1046ed68f7af9c93b932d320fe508
Parents: 6fda423
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Tue Jun 9 17:33:00 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Tue Jun 9 18:29:53 2015 -0700
----------------------------------------------------------------------
_data/docs.json | 112 ++++++++++++++++---
.../040-file-system-storage-plugin.md | 2 +-
_docs/img/odbc-configure1.png | Bin 0 -> 43220 bytes
_docs/img/odbc-configure2.png | Bin 0 -> 48218 bytes
_docs/img/odbc-configure3.png | Bin 0 -> 49108 bytes
_docs/img/odbc-drivers.png | Bin 0 -> 49123 bytes
_docs/img/odbc-mapr-drill-apps.png | Bin 0 -> 40753 bytes
_docs/img/odbc-test.png | Bin 0 -> 9105 bytes
_docs/img/odbc-user-dsn.png | Bin 0 -> 36866 bytes
.../040-installing-drill-on-windows.md | 4 +-
.../020-configuring-odbc-on-linux-mac-os-x.md | 30 +++--
.../030-configuring-odbc-on-windows.md | 54 +++++----
.../040-testing-the-odbc-connection.md | 7 +-
.../010-installing-the-driver-on-linux.md | 2 +-
.../020-installing-the-driver-on-mac-os-x.md | 2 +-
.../030-installing-the-driver-on-windows.md | 31 +++--
.../040-installing-the-tdc-file-on-windows.md | 17 +++
.../040-querying-directories.md | 2 +
18 files changed, 194 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index ff4945b..bf8a6d6 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -1220,8 +1220,8 @@
"next_title": "ODBC Configuration Reference",
"next_url": "/docs/odbc-configuration-reference/",
"parent": "ODBC/JDBC Interfaces",
- "previous_title": "Installing the Driver on Windows",
- "previous_url": "/docs/installing-the-driver-on-windows/",
+ "previous_title": "Installing the TDC File on Windows",
+ "previous_url": "/docs/installing-the-tdc-file-on-windows/",
"relative_path": "_docs/odbc-jdbc-interfaces/040-configuring-odbc.md",
"title": "Configuring ODBC",
"url": "/docs/configuring-odbc/"
@@ -3961,8 +3961,8 @@
}
],
"children": [],
- "next_title": "Configuring ODBC",
- "next_url": "/docs/configuring-odbc/",
+ "next_title": "Installing the TDC File on Windows",
+ "next_url": "/docs/installing-the-tdc-file-on-windows/",
"parent": "Installing the ODBC Driver",
"previous_title": "Installing the Driver on Mac OS X",
"previous_url": "/docs/installing-the-driver-on-mac-os-x/",
@@ -4032,14 +4032,35 @@
}
],
"children": [],
- "next_title": "Configuring ODBC",
- "next_url": "/docs/configuring-odbc/",
+ "next_title": "Installing the TDC File on Windows",
+ "next_url": "/docs/installing-the-tdc-file-on-windows/",
"parent": "Installing the ODBC Driver",
"previous_title": "Installing the Driver on Mac OS X",
"previous_url": "/docs/installing-the-driver-on-mac-os-x/",
"relative_path": "_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md",
"title": "Installing the Driver on Windows",
"url": "/docs/installing-the-driver-on-windows/"
+ },
+ {
+ "breadcrumbs": [
+ {
+ "title": "Installing the ODBC Driver",
+ "url": "/docs/installing-the-odbc-driver/"
+ },
+ {
+ "title": "ODBC/JDBC Interfaces",
+ "url": "/docs/odbc-jdbc-interfaces/"
+ }
+ ],
+ "children": [],
+ "next_title": "Configuring ODBC",
+ "next_url": "/docs/configuring-odbc/",
+ "parent": "Installing the ODBC Driver",
+ "previous_title": "Installing the Driver on Windows",
+ "previous_url": "/docs/installing-the-driver-on-windows/",
+ "relative_path": "_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/040-installing-the-tdc-file-on-windows.md",
+ "title": "Installing the TDC File on Windows",
+ "url": "/docs/installing-the-tdc-file-on-windows/"
}
],
"next_title": "Installing the Driver on Linux",
@@ -4051,6 +4072,27 @@
"title": "Installing the ODBC Driver",
"url": "/docs/installing-the-odbc-driver/"
},
+ "Installing the TDC File on Windows": {
+ "breadcrumbs": [
+ {
+ "title": "Installing the ODBC Driver",
+ "url": "/docs/installing-the-odbc-driver/"
+ },
+ {
+ "title": "ODBC/JDBC Interfaces",
+ "url": "/docs/odbc-jdbc-interfaces/"
+ }
+ ],
+ "children": [],
+ "next_title": "Configuring ODBC",
+ "next_url": "/docs/configuring-odbc/",
+ "parent": "Installing the ODBC Driver",
+ "previous_title": "Installing the Driver on Windows",
+ "previous_url": "/docs/installing-the-driver-on-windows/",
+ "relative_path": "_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/040-installing-the-tdc-file-on-windows.md",
+ "title": "Installing the TDC File on Windows",
+ "url": "/docs/installing-the-tdc-file-on-windows/"
+ },
"Interfaces Introduction": {
"breadcrumbs": [
{
@@ -4882,14 +4924,35 @@
}
],
"children": [],
- "next_title": "Configuring ODBC",
- "next_url": "/docs/configuring-odbc/",
+ "next_title": "Installing the TDC File on Windows",
+ "next_url": "/docs/installing-the-tdc-file-on-windows/",
"parent": "Installing the ODBC Driver",
"previous_title": "Installing the Driver on Mac OS X",
"previous_url": "/docs/installing-the-driver-on-mac-os-x/",
"relative_path": "_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md",
"title": "Installing the Driver on Windows",
"url": "/docs/installing-the-driver-on-windows/"
+ },
+ {
+ "breadcrumbs": [
+ {
+ "title": "Installing the ODBC Driver",
+ "url": "/docs/installing-the-odbc-driver/"
+ },
+ {
+ "title": "ODBC/JDBC Interfaces",
+ "url": "/docs/odbc-jdbc-interfaces/"
+ }
+ ],
+ "children": [],
+ "next_title": "Configuring ODBC",
+ "next_url": "/docs/configuring-odbc/",
+ "parent": "Installing the ODBC Driver",
+ "previous_title": "Installing the Driver on Windows",
+ "previous_url": "/docs/installing-the-driver-on-windows/",
+ "relative_path": "_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/040-installing-the-tdc-file-on-windows.md",
+ "title": "Installing the TDC File on Windows",
+ "url": "/docs/installing-the-tdc-file-on-windows/"
}
],
"next_title": "Installing the Driver on Linux",
@@ -4997,8 +5060,8 @@
"next_title": "ODBC Configuration Reference",
"next_url": "/docs/odbc-configuration-reference/",
"parent": "ODBC/JDBC Interfaces",
- "previous_title": "Installing the Driver on Windows",
- "previous_url": "/docs/installing-the-driver-on-windows/",
+ "previous_title": "Installing the TDC File on Windows",
+ "previous_url": "/docs/installing-the-tdc-file-on-windows/",
"relative_path": "_docs/odbc-jdbc-interfaces/040-configuring-odbc.md",
"title": "Configuring ODBC",
"url": "/docs/configuring-odbc/"
@@ -11897,14 +11960,35 @@
}
],
"children": [],
- "next_title": "Configuring ODBC",
- "next_url": "/docs/configuring-odbc/",
+ "next_title": "Installing the TDC File on Windows",
+ "next_url": "/docs/installing-the-tdc-file-on-windows/",
"parent": "Installing the ODBC Driver",
"previous_title": "Installing the Driver on Mac OS X",
"previous_url": "/docs/installing-the-driver-on-mac-os-x/",
"relative_path": "_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md",
"title": "Installing the Driver on Windows",
"url": "/docs/installing-the-driver-on-windows/"
+ },
+ {
+ "breadcrumbs": [
+ {
+ "title": "Installing the ODBC Driver",
+ "url": "/docs/installing-the-odbc-driver/"
+ },
+ {
+ "title": "ODBC/JDBC Interfaces",
+ "url": "/docs/odbc-jdbc-interfaces/"
+ }
+ ],
+ "children": [],
+ "next_title": "Configuring ODBC",
+ "next_url": "/docs/configuring-odbc/",
+ "parent": "Installing the ODBC Driver",
+ "previous_title": "Installing the Driver on Windows",
+ "previous_url": "/docs/installing-the-driver-on-windows/",
+ "relative_path": "_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/040-installing-the-tdc-file-on-windows.md",
+ "title": "Installing the TDC File on Windows",
+ "url": "/docs/installing-the-tdc-file-on-windows/"
}
],
"next_title": "Installing the Driver on Linux",
@@ -12012,8 +12096,8 @@
"next_title": "ODBC Configuration Reference",
"next_url": "/docs/odbc-configuration-reference/",
"parent": "ODBC/JDBC Interfaces",
- "previous_title": "Installing the Driver on Windows",
- "previous_url": "/docs/installing-the-driver-on-windows/",
+ "previous_title": "Installing the TDC File on Windows",
+ "previous_url": "/docs/installing-the-tdc-file-on-windows/",
"relative_path": "_docs/odbc-jdbc-interfaces/040-configuring-odbc.md",
"title": "Configuring ODBC",
"url": "/docs/configuring-odbc/"
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/connect-a-data-source/040-file-system-storage-plugin.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/040-file-system-storage-plugin.md b/_docs/connect-a-data-source/040-file-system-storage-plugin.md
index e50d103..f7e5bf3 100644
--- a/_docs/connect-a-data-source/040-file-system-storage-plugin.md
+++ b/_docs/connect-a-data-source/040-file-system-storage-plugin.md
@@ -19,7 +19,7 @@ In a Drill cluster, you typically do not query the local file system, but instea
To register a local or a distributed file system with Apache Drill, complete
the following steps:
- 1. Navigate to `[http://localhost:8047](http://localhost:8047/)`, and select the **Storage** tab.
+ 1. Navigate to http://localhost:8047, and select the **Storage** tab.
2. In the New Storage Plugin window, enter a unique name and then click **Create**.
3. In the Configuration window, provide the following configuration information for the type of file system that you are configuring as a data source.
* Local file system example:
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/img/odbc-configure1.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-configure1.png b/_docs/img/odbc-configure1.png
new file mode 100755
index 0000000..28717bd
Binary files /dev/null and b/_docs/img/odbc-configure1.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/img/odbc-configure2.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-configure2.png b/_docs/img/odbc-configure2.png
new file mode 100755
index 0000000..21db003
Binary files /dev/null and b/_docs/img/odbc-configure2.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/img/odbc-configure3.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-configure3.png b/_docs/img/odbc-configure3.png
new file mode 100755
index 0000000..e04707b
Binary files /dev/null and b/_docs/img/odbc-configure3.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/img/odbc-drivers.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-drivers.png b/_docs/img/odbc-drivers.png
new file mode 100755
index 0000000..23b9c39
Binary files /dev/null and b/_docs/img/odbc-drivers.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/img/odbc-mapr-drill-apps.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-mapr-drill-apps.png b/_docs/img/odbc-mapr-drill-apps.png
new file mode 100755
index 0000000..060edac
Binary files /dev/null and b/_docs/img/odbc-mapr-drill-apps.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/img/odbc-test.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-test.png b/_docs/img/odbc-test.png
new file mode 100755
index 0000000..5dbf08d
Binary files /dev/null and b/_docs/img/odbc-test.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/img/odbc-user-dsn.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-user-dsn.png b/_docs/img/odbc-user-dsn.png
new file mode 100755
index 0000000..f957607
Binary files /dev/null and b/_docs/img/odbc-user-dsn.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/install/installing-drill-in-embedded-mode/040-installing-drill-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/install/installing-drill-in-embedded-mode/040-installing-drill-on-windows.md b/_docs/install/installing-drill-in-embedded-mode/040-installing-drill-on-windows.md
index 93d6ef6..2440667 100755
--- a/_docs/install/installing-drill-in-embedded-mode/040-installing-drill-on-windows.md
+++ b/_docs/install/installing-drill-in-embedded-mode/040-installing-drill-on-windows.md
@@ -2,9 +2,9 @@
title: "Installing Drill on Windows"
parent: "Installing Drill in Embedded Mode"
---
-You can install Drill on Windows 7 or 8. First, check that you [meet the prerequisites]({{site.baseurl}}/docs/embedded-mode-prerequisites), including setting the JAVA_HOME environment variable, and then install Drill. Complete the following steps to install Drill:
+First, check that you [meet the prerequisites]({{site.baseurl}}/docs/embedded-mode-prerequisites), including setting the JAVA_HOME environment variable, and then install Drill. Complete the following steps to install Drill:
-1. Click the following link to download the latest, stable version of Apache Drill: [http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz](http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz)
+1. Click the following link to download the latest version of Apache Drill: [http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz](http://getdrill.org/drill/download/apache-drill-1.0.0.tar.gz)
2. Move the `apache-drill-1.0.0.tar.gz` file to a directory where you want to install Drill.
3. Unzip the `TAR.GZ` file using a third-party tool. If the tool you use does not unzip the TAR file as well as the `TAR.GZ` file, unzip the `apache-drill-1.0.0.tar` to extract the Drill software. The extraction process creates the installation directory named apache-drill-1.0.0 containing the Drill software. For example:
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md
index fb38ae2..d9e85be 100644
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md
@@ -92,31 +92,43 @@ Define the ODBC data sources in the `~/.odbc.ini` configuration file for your en
# Driver: The location where the ODBC driver is installed to.
Driver=/opt/mapr/drillodbc/lib/universal/libmaprdrillodbc.dylib
+ # The DriverUnicodeEncoding setting is only used for SimbaDM
+ # When set to 1, SimbaDM runs in UTF-16 mode.
+ # When set to 2, SimbaDM runs in UTF-8 mode.
+ #DriverUnicodeEncoding=2
+
# Values for ConnectionType, AdvancedProperties, Catalog, Schema should be set here.
+
# If ConnectionType is Direct, include Host and Port. If ConnectionType is ZooKeeper, include ZKQuorum and ZKClusterID
- # They can also be specified in the connection string.
+ # They can also be specified on the connection string.
+ # AuthenticationType: No authentication; Basic Authentication
ConnectionType=Direct
HOST=localhost
PORT=31010
- ZKQuorum=
- ZKClusterID=
- AdvancedProperties={HandshakeTimeout=5;QueryTimeout=180;TimestampTZDisplayTimeout=utc;ExcludedSchemas=sys,INFORMATION_SCHEMA}
+ ZKQuorum=[Zookeeper Quorum]
+ ZKClusterID=[Cluster ID]
+ AuthenticationType=No Authentication
+ UID=[USERNAME]
+ PWD=[PASSWORD]
+ AdvancedProperties=CastAnyToVarchar=true;HandshakeTimeout=5;QueryTimeout=180;TimestampTZDisplayTimezone=utc;ExcludedSchemas=sys,INFORMATION_SCHEMA;NumberOfPrefetchBuffers=5;
Catalog=DRILL
Schema=
-If ConnectionType=Zookeeper, get the ZKQuorum and ZKClusterID values from the `drill-override.conf` file, and define the ZKQuorum and ZKClusterID properties. For example:
+### Authentication Properties
+To password protect the DSN, uncomment the AuthenticationType, select Basic Authentication for the AuthenticationType, and configure UID and PWD properties.
+
+### Direct to Drillbit and ZooKeeper Quorum Properties
+To use Drill in distributed mode, set ConnectionType to Zookeeper, get the ZKQuorum and ZKClusterID values from the `drill-override.conf` file, and define the ZKQuorum and ZKClusterID properties. For example:
* `ZKQuorum=localhost:2181`
* `ZKClusterID=drillbits1`
-If ConnectionType=Direct, define HOST and PORT properties. For example:
+To use Drill in embedded mode, set ConnectionType to Direct and define HOST and PORT properties. For example:
* `HOST=localhost`
* `PORT=31010`
-[Driver
-Configuration
-Options]({{ site.baseurl }}/docs/odbc-configuration-reference/#configuration-options) describes configuration options available for controlling the
+[Driver Configuration Options]({{ site.baseurl }}/docs/odbc-configuration-reference/#configuration-options) describes configuration options available for controlling the
behavior of DSNs using the MapR Drill ODBC Driver.
----------
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md
index 562f3b1..d164cb5 100644
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md
@@ -13,39 +13,47 @@ sources:
## Create a Data Source Name (DSN)
-Create a DSN that an application can use to connect to Drill data sources. If
+Create a DSN to connect to Drill data sources. If
you want to create a DSN for a 32-bit application, you must use the 32-bit
version of the ODBC Administrator to create the DSN.
-1. To launch the ODBC Administrator, click **Start > All Programs > MapR Drill ODBC Driver 1.0 (32|64-bit) > (32|64-bit) ODBC Administrator**.
+1. Click **Start**, and locate the ODBC Administrator app that you installed, and click the ODBC Administrator app icon to start the app.
+ The ODBC Data Source Administrator dialog appears.
+ 
+
+2. Click the **System DSN** tab, and in System Data Sources, select MapR ODBC Driver for Drill DSN.
+ 
+ The system DSN is available for all users who log in to the machine. You can set up a user DSN is available only to the user who creates the DSN.
+3. Click **Configure**.
+ The MapR Drill ODBC Driver DSN Setup dialog appears with a preconfigured sample DSN. The following screenshot shows a possible DSN configuration for using Drill in embedded mode.
+ 
- To launch the 32-bit version of the ODBC driver on a 64-bit machine, run:
-`C:\WINDOWS\SysWOW64\odbcad32.exe`.
- The ODBC Data Source Administrator window appears.
-2. Create a system or user DSN on the **System DSN** or **User DSN** tab, respectively. A system DSN is available for all users who log in to the machine. A user DSN is available to the user who creates the DSN.
-3. Click **Add**.
-4. Select **MapR Drill ODBC Driver** and click **Finish**.
- The _MapR Drill ODBC Driver DSN Setup_ window appears.
-5. In the **Data Source Name** field, enter a name for the DSN.
-6. Optionally, enter a description of the DSN in the Description field.
-7. In the Connection Type section, select one of the following connection types:
- * ZooKeeper Quorum
- * Direct to Drillbit
-8. If you select **ZooKeeper Quorum**, provide values for the following properties:
+### Authentication Options
+To password protect the DSN, uncomment the AuthenticationType, select Basic Authentication in the Authentication Type dropdown, and configure UID and PWD properties. To configure no password protection, select No Authentication.
+
+### Direct to Drillbit and ZooKeeper Quorum Options
+In the Connection Type section, Direct to Drillbit is selected for using Drill in embedded mode. To use Drill in embedded mode, set ConnectionType to Direct and define HOST and PORT properties. For example:
+
+* `HOST=localhost`
+* `PORT=31010`
+
+Check the `drill-override.conf` file for any port changes.
+
+To use Drill in distributed mode, select **ZooKeeper Quorum**.
+
+
+If you select **ZooKeeper Quorum**, provide values for the following properties:
* Quorum
A comma separated list of ZooKeeper nodes in the following format:
`<host name/ip address> : <port number>, <host name/ip address> : <port number>, . . .`
* Cluster ID
- Name of the drillbit cluster, drillbits1 by default. Check the `drill-override.conf` file for any cluster name changes.
+ Name of the drillbit cluster, drillbits1 by default.
+
+Check the `drill-override.conf` file for ZooKeeper node information and for any cluster name changes.
- If you select Direct to Drillbit, provide the IP address or host name of the Drill server and the Drill listen port number, 31010 by default. Check the `drill-override.conf` file for any port changes.
-9. In **Default Schema**, select the [default schema]({{site.baseurl}}/docs/configuring-connections-on-windows/#schema) to connect to.
-10. Optionally, perform the following operations:
- * Update the [advanced properties]({{site.baseurl}}/docs/configuring-connections-on-windows/#advanced-properties) configuration.
- * Configure [logging options]({{site.baseurl}}/docs/configuring-connections-on-windows/#logging-options) to log types of events.
-11. Click **OK** to save the DSN.
+[Advanced Properties]({{site.baseurl}}/docs/odbc-configuration-reference/), [logging options]({{site.baseurl}}/docs/odbc-configuration-reference/#logging-options), and [Drill Explorer].
### Next Step
-[Connect to Drill Data Sources from a BI Tool]({{ site.baseurl }}/docs/connecting-to-odbc-data-sources).
+[Testing the ODBC Connection]({{ site.baseurl }}/docs/testing-the-odbc-connection/).
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md
index 1b37721..28b1a7e 100644
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/040-testing-the-odbc-connection.md
@@ -59,4 +59,9 @@ using the following format:
To test the ODBC connection on Windows, follow these steps:
-1. [Start Drill]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/).
\ No newline at end of file
+1. Follow instructions to configure the ODBC connection on Windows.
+ The MapR Drill ODBC Driver DSN Setup dialog is displayed.
+ 
+
+2. Click the Test Button.
+ 
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
index f3e111e..a9d57ba 100755
--- a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
+++ b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/010-installing-the-driver-on-linux.md
@@ -8,7 +8,7 @@ the version of the driver that matches the architecture of the client
application that you use to access Drill. The 64-bit editions of Linux support
32- and 64-bit applications.
-To install the MapR Drill ODBC Driver, verify that your system meets the [prerequisites] before you start, and then complete the following steps described in detail in this document:
+To ensure success, install the MapR Drill ODBC Driver on a system that meets the [system requirements]({{site.baseurl}}/docs/installing-the-driver-on-linux/) before you start, and then complete the following steps described in detail in this document:
* [Step 1: Download the MapR Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-linux/#step-1:-download-the-mapr-drill-odbc-driver)
* [Step 2: Install the MapR Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-linux/#step-2:-install-the-mapr-drill-odbc-driver)
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
index 3bfcb6c..144d848 100755
--- a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
+++ b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/020-installing-the-driver-on-mac-os-x.md
@@ -5,7 +5,7 @@ parent: "Installing the ODBC Driver"
Install the MapR Drill ODBC Driver on the machine from which you connect to
the Drill service.
-To install the MapR Drill ODBC Driver, verify that your system meets the [prerequisites]({{site.baseurl}}/docs/install-the-driver-on-mac-os-x/#system-requirements) before you start, and then complete the following steps described in detail in this document:
+To ensure success, install the MapR Drill ODBC Driver on a system that meets the [system requirements]({{site.baseurl}}/docs/install-the-driver-on-mac-os-x/#system-requirements) before you start, and then complete the following steps described in detail in this document:
* [Step 1: Download the MapR Drill ODBC Driver]({{site.baseurl}}/docs/install-the-driver-on-mac-os-x/#step-1:-download-the-mapr-drill-odbc-driver)
* [Step 2: Install the MapR Drill ODBC Driver]({{site.baseurl}}/docs/install-the-driver-on-mac-os-x/#step-2:-install-the-mapr-drill-odbc-driver)
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md
index eb44847..e67c3cd 100755
--- a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md
+++ b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/030-installing-the-driver-on-windows.md
@@ -6,7 +6,7 @@ The MapR Drill ODBC Driver installer is available for 32-bit and 64-bit
applications on Windows. Both versions of the driver can be installed on a 64-bit
machine.
-To install the MapR Drill ODBC Driver, verify that your system meets the [prerequisites] before you start, and then complete the following steps described in detail in this document:
+To ensure success, install the MapR Drill ODBC Driver on a system that meets the [system requirements]({{site.baseurl}}/docs/installing-the-driver-on-windows/). Complete the following steps described in detail in this document:
* [Step 1: Download the MapR Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-windows/#step-1:-download-the-mapr-drill-odbc-driver)
* [Step 2: Install the MapR Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-windows/#step-2:-install-the-mapr-drill-odbc-driver)
@@ -22,9 +22,9 @@ requirements:
* Windows® 7 Professional
* Windows® Server 2012, 2012 R2
* Windows® Server 2008, 2013 R2
- * .NET Framework 4.5.2 is required to run the Drill Explorer application.
+ * .NET Framework 4.5, installed and enabled by default on Windows 8 and later
* 60 MB of available disk space
- * The client must be able to resolve the actual hostname of the Drill node(s) with the IP(s). Verify that a DNS entry was created on the client machine for the Drill node(s). If not, create the following entry for the Drill node(s) in the `%WINDIR%\system32\drivers\etc\hosts` file:
+ * The client must be able to resolve the actual hostname of the Drill node(s) with the IP(s). Verify that a DNS entry was created on the client machine for the Drill node(s). If not, create an entry for the Drill node(s) in the HOSTS file:
`<drill-machine-IP> <drill-machine-hostname>`
Example: `127.0.1.1 apachedemo`
@@ -57,25 +57,22 @@ Download the installer that corresponds to the bitness of the client application
To verify the installation, perform the following steps:
-1. Click **Start > All Programs > MapR Drill ODBC Driver 1.0 (32|64-bit) > (32|64-bit) ODBC Administrator**.
-2. Click the **Drivers** tab and verify that the MapR Drill ODBC Driver appears in the list of drivers that are installed on the computer.
+1. Click **Start**, and locate the ODBC Administrator app that you just installed.
+ Installing the ODBC Administrator installs Drill Explorer and the Tableau TDC file. For example, on Windows 8.1 in Apps, the several apps appear under MaprDrill ODBC Driver 1.0:
+ 
+
+2. Click the ODBC Administrator app icon.
+ The ODBC Data Source Administrator dialog appears.
+ 
+3. Click the **Drivers** tab and verify that the MapR Drill ODBC Driver appears in the list of drivers that are installed on the computer.
+ 
+
+You need to start Drill before [testing]({{site.baseurl}}/docs/testing-the-odbc-connection/) the ODBC Data Source Administrator.
## The Tableau Data-connection Customization (TDC) File
The MapR Drill ODBC Driver includes a file named `MapRDrillODBC.TDC`. The TDC file includes customizations that improve ODBC configuration and performance
when using Tableau.
-### Installing the TDC File
-The MapR Drill ODBC driver installer automatically installs the TDC file if the installer can find the Tableau installation. If you installed the MapR Drill ODBC driver first and then installed Tableau, the TDC file is not installed automatically, and you need to install the TDC file manually.
-
-**To install the MapRDrillODBC.TDC file manually:**
-
-1. Click **Start > All Programs > MapR Drill ODBC Driver <version> (32|64-bit) > Install Tableau TDC File**.
-2. When the installation completes, press any key to continue.
-For example, you can press the SPACEBAR key.
-
-If the installation of the TDC file fails, this is likely due to your Tableau repository being in location other than the default one. In this case, manually copy the My Tableau Repository to C:\Users\<user>\Documents\My Tableau Repository. Repeat the procedure to install the MapRDrillODBC.TDC file manually.
-
-
### Next Step
[Configuring ODBC on Windows]({{ site.baseurl }}/docs/configuring-odbc-on-windows).
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/040-installing-the-tdc-file-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/040-installing-the-tdc-file-on-windows.md b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/040-installing-the-tdc-file-on-windows.md
new file mode 100644
index 0000000..d922e24
--- /dev/null
+++ b/_docs/odbc-jdbc-interfaces/installing-the-odbc-driver/040-installing-the-tdc-file-on-windows.md
@@ -0,0 +1,17 @@
+---
+title: "Installing the TDC File on Windows"
+parent: "Installing the ODBC Driver"
+---
+The MapR Drill ODBC driver installer automatically installs the TDC file if the installer can find the Tableau installation. If you installed the MapR Drill ODBC driver first and then installed Tableau, the TDC file is not installed automatically, and you need to install the TDC file manually.
+
+**To install the MapRDrillODBC.TDC file manually:**
+
+1. Click **Start**, and locate the Install Tableau TDC File app that the MapR Drill ODBC Driver installer installed.
+ For example, on Windows 8.1 in Apps, the Install Tableau TDC File appears under MaprDrill ODBC Driver 1.0:
+ 
+
+2. Click **Install Tableau TDC File**.
+3. When the installation completes, press any key to continue.
+For example, you can press the SPACEBAR key.
+
+If the installation of the TDC file fails, this is likely due to your Tableau repository being in location other than the default one. In this case, manually copy the My Tableau Repository to C:\Users\<user>\Documents\My Tableau Repository. Repeat the procedure to install the MapRDrillODBC.TDC file manually.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/drill/blob/596e4f95/_docs/query-data/query-a-file-system/040-querying-directories.md
----------------------------------------------------------------------
diff --git a/_docs/query-data/query-a-file-system/040-querying-directories.md b/_docs/query-data/query-a-file-system/040-querying-directories.md
index 88b5b40..7f0c753 100644
--- a/_docs/query-data/query-a-file-system/040-querying-directories.md
+++ b/_docs/query-data/query-a-file-system/040-querying-directories.md
@@ -89,3 +89,5 @@ first level down from logs, `dir1` to the next level, and so on.
+------------+------------+------------+------------+------------+------------+------------+------------+------------+-------------+
10 rows selected (0.583 seconds)
+You can use [query directory functions]({{site.baseurl}}/docs/query-directory-functions/) to restrict a query to one of a number of subdirectories and to prevent Drill from scanning all data in directories.
+