Repository: drill Updated Branches: refs/heads/gh-pages 3d023e2a3 -> e8aba59fd
DRILL-3282 broken link proofreading corrections Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/e8aba59f Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/e8aba59f Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/e8aba59f Branch: refs/heads/gh-pages Commit: e8aba59fddd0488f1173900432ced0d2914cc7da Parents: 3d023e2 Author: Kristine Hahn <[email protected]> Authored: Wed Jun 17 10:54:12 2015 -0700 Committer: Kristine Hahn <[email protected]> Committed: Wed Jun 17 14:02:37 2015 -0700 ---------------------------------------------------------------------- .../010-architecture-introduction.md | 2 +- .../040-file-system-storage-plugin.md | 6 ++-- .../010-odbc-configuration-reference.md | 2 +- .../025-configuring-odbc-on-mac-os-x.md | 5 +-- .../030-configuring-odbc-on-windows.md | 4 +-- .../040-testing-the-odbc-connection.md | 34 ++++++++++---------- .../010-installing-the-driver-on-linux.md | 6 ++-- .../020-installing-the-driver-on-mac-os-x.md | 2 +- .../030-browsing-data-and-creating-views.md | 2 +- ...010-using-odbc-with-bi-tools-introduction.md | 15 ++++++--- .../020-getting-to-know-the-drill-sandbox.md | 4 +-- 11 files changed, 43 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/e8aba59f/_docs/architecture/010-architecture-introduction.md ---------------------------------------------------------------------- diff --git a/_docs/architecture/010-architecture-introduction.md b/_docs/architecture/010-architecture-introduction.md index 7c06469..8cb0e80 100755 --- a/_docs/architecture/010-architecture-introduction.md +++ b/_docs/architecture/010-architecture-introduction.md @@ -37,7 +37,7 @@ You can access Drill through the following interfaces: * [Drill shell]({{ site.baseurl }}/docs/configuring-the-drill-shell/) * [Drill Web UI]({{ site.baseurl }}/docs/monitoring-and-canceling-queries-in-the-drill-web-ui) - * [ODBC/JDBC]({{ site.baseurl }}/docs/odbc-jdbc-interfaces/#using-odbc-to-access-apache-drill-from-bi-tools) + * [ODBC/JDBC]({{ site.baseurl }}/docs/interfaces-introduction/#using-odbc-to-access-apache-drill-from-bi-tools) * C++ API ### **_Dynamic schema discovery_** http://git-wip-us.apache.org/repos/asf/drill/blob/e8aba59f/_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 f7e5bf3..0298cb0 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 @@ -32,7 +32,7 @@ the following steps: "root": { "location": "/user/max/donuts", "writable": false, - "defaultinputformat": null + "defaultInputFormat": null } }, "formats" : { @@ -51,7 +51,7 @@ the following steps: "root" : { "location" : "/user/root/drill", "writable" : true, - "defaultinputformat" : null + "defaultInputFormat" : null } }, "formats" : { @@ -80,7 +80,7 @@ workspace named `json_files` configured to point Drill to the "json_files" : { "location" : "/users/max/drill/json/", "writable" : false, - "defaultinputformat" : json + "defaultInputFormat" : json } }, http://git-wip-us.apache.org/repos/asf/drill/blob/e8aba59f/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md ---------------------------------------------------------------------- diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md index d5dbe0f..797644e 100644 --- a/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md +++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/010-odbc-configuration-reference.md @@ -177,5 +177,5 @@ To disable logging: 2. Set the LogLevel key to 0 3. Save the mapr.drillodbc.ini configuration file. -#### What's Next? Go to [Connecting to Drill Data Sources from a BI Tool]({{ site.baseurl }}/docs/connecting-to-odbc-data-sources). +#### What's Next? Go to [Connecting to ODBC Data Sources]({{ site.baseurl }}/docs/connecting-to-odbc-data-sources). http://git-wip-us.apache.org/repos/asf/drill/blob/e8aba59f/_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md ---------------------------------------------------------------------- diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md index a93b31c..926410f 100644 --- a/_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md +++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md @@ -6,10 +6,10 @@ ODBC driver managers use configuration files to define and configure ODBC data sources and drivers. To configure an ODBC connection for Linux or Mac OS X, complete the following steps: -* [Step 1: Set Environment Variables]({{site.baseurl}}/docs/configuring-odbc-on-mac-os-x/#step-1:-set-environment-variables) (Linux only) +* [Step 1: Set Environment Variables]({{site.baseurl}}/docs/configuring-odbc-on-mac-os-x/#step-1:-set-environment-variables) * [Step 2: Define the ODBC Data Sources in odbc.ini]({{site.baseurl}}/docs/configuring-odbc-on-mac-os-x/#step-2:-define-the-odbc-data-sources-in-.odbc.ini) * [Step 3: (Optional) Define the ODBC Driver in odbcinst.ini]({{site.baseurl}}/docs/configuring-odbc-on-mac-os-x/#step-3:-(optional)-define-the-odbc-driver-in-.odbcinst.ini) -* [Step 4: Configure the MapR Drill ODBC Driver]({{site.baseurl}}/docs/configuring-odbc-on-mac-os-x/#configuring-.mapr.drillodbc.ini) +* [Step 4: Configure the MapR Drill ODBC Driver]({{site.baseurl}}/docs/configuring-odbc-on-mac-os-x/#step-4:-configure-the-mapr-drill-odbc-driver) ## Sample Configuration Files @@ -45,6 +45,7 @@ Create or modify the `/etc/launchd.conf` file to set environment variables. Set launchctl setenv DYLD_LIBRARY_PATH /usr/local/iODBC/lib:/opt/mapr/drillodbc/lib/universal Restart the Mac OS X or run `launchctl load /etc/launchd.conf`. + ---------- ## Step 2: Define the ODBC Data Sources in .odbc.ini http://git-wip-us.apache.org/repos/asf/drill/blob/e8aba59f/_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 16dc102..71bc2d5 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 @@ -9,8 +9,6 @@ sources: * Create a Data Source Name * Create an ODBC Connection String -**Prerequisite:** An Apache Drill installation must be [configured]({{ site.baseurl }}/docs/connect-a-data-source-introduction/) to access the data sources that you want to connect to. For information about how to install Apache Drill, see [Install Drill]({{ site.baseurl }}/docs/install-drill). - ## Sample ODBC Configuration (DSN) You can see how to create a DSN to connect to Drill data sources by taking a look at the preconfigured sample that the installer sets up. If @@ -52,7 +50,7 @@ If you select ZooKeeper Quorum, provide values for the following properties: Check the `drill-override.conf` file for the cluster name.  -[Advanced Properties]({{site.baseurl}}/docs/odbc-configuration-reference/), [logging options]({{site.baseurl}}/docs/odbc-configuration-reference/#logging-options), and [Drill Explorer]({{site.baseurl}}/docs/drill-explorer-introduction/). +[Advanced Properties]({{site.baseurl}}/docs/odbc-configuration-reference/), [logging options]({{site.baseurl}}/docs/odbc-configuration-reference/#logging-options), and [Drill Explorer]({{site.baseurl}}/docs/drill-explorer-introduction/) sections describe the options at the bottom of this dialog. ### Next Step http://git-wip-us.apache.org/repos/asf/drill/blob/e8aba59f/_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 d23d801..46ee4e2 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 @@ -4,26 +4,10 @@ parent: "Configuring ODBC" --- The procedure for testing the ODBC connection differs depending on your platform, as described in the following sections: -* [Testing the ODBC Connection on Mac OS X]({{site.baseurl}}/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-mac-os-x) * [Testing the ODBC Connection on Linux]({{site.baseurl}}/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-linux) +* [Testing the ODBC Connection on Mac OS X]({{site.baseurl}}/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-mac-os-x) * [Testing the ODBC Connection on Windows]({{site.baseurl}}/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-windows) -## Testing the ODBC Connection on Mac OS X - -To test the ODBC connection Mac OS X, follow these steps. - -1. [Start Drill]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/). -2. Start the iODBC Administrator.app in `/Applications`. - The iODBC Data Source Administrator dialog appears. -2. On the User DSN tab, select the MapR Drill DSN. -  -3. Click **Test**. - The Login for Sample MapR Drill DSN dialog appears. -  -4. If you configured Basic Authentication in the `.odbc.ini`, enter the user name and password you also configured; otherwise, click **OK**. - The success message appears. -  - ## Testing the ODBC Connection on Linux To test the ODBC connection on Linux use the test utilities in the `samples` directory of the driver manager installation: `iodbctest` and `iodbctestw`. Use `iodbctest` to @@ -84,6 +68,22 @@ To test the ODBC connection on a Linux cluster, follow these steps: After he `SQL>` prompt appears, go to the Drill shell to run commands. Do not attempt to run SQL commands from this prompt. +## Testing the ODBC Connection on Mac OS X + +To test the ODBC connection on Mac OS X, follow these steps. + +1. [Start Drill]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/). +2. Start the iODBC Administrator.app in `/Applications`. + The iODBC Data Source Administrator dialog appears. +2. On the User DSN tab, select the MapR Drill DSN. +  +3. Click **Test**. + The Login for Sample MapR Drill DSN dialog appears. +  +4. If you configured Basic Authentication in the `.odbc.ini`, enter the user name and password you also configured; otherwise, click **OK**. + The success message appears. +  + ## Testing the ODBC Connection on Windows To test the ODBC connection on Windows, follow these steps: http://git-wip-us.apache.org/repos/asf/drill/blob/e8aba59f/_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 440fdeb..c74fb70 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,11 +8,11 @@ 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. -Install the MapR Drill ODBC Driver on a system that meets the [system requirements]({{site.baseurl}}/docs/installing-the-driver-on-linux/), and then complete the following steps described in detail in this document: +Install the MapR Drill ODBC Driver on a system that meets the [system requirements]({{site.baseurl}}/docs/installing-the-driver-on-linux/#system-requirements), 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) - * [Step 3: Set the LD_LIBRARY_PATH Environment Variable]({{site.baseurl}}/docs/installing-the-driver-on-linux/#step-3:-check-the-mapr-drill-odbc-driver-version) + * [Step 3: Check the MapR Drill ODBC Driver version]({{site.baseurl}}/docs/installing-the-driver-on-linux/#step-3:-check-the-mapr-drill-odbc-driver-version) Verify that your system meets the system requirements before you start. @@ -90,5 +90,5 @@ or ### Next Step -[Configuring ODBC on Linux and Mac OS X]({{ site.baseurl }}/docs/configuring-odbc-on-linux-mac-os-x/). +[Configuring ODBC on Linux]({{ site.baseurl }}/docs/configuring-odbc-on-linux/). http://git-wip-us.apache.org/repos/asf/drill/blob/e8aba59f/_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 80e6ada..ab24810 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 @@ -63,4 +63,4 @@ To check the version of the driver you installed, use the following command on t ### Next Step -[Configuring ODBC on Linux and Mac OS X]({{ site.baseurl }}/docs/configuring-odbc-on-linux-mac-os-x/). +[Configuring ODBC on Mac OS X]({{ site.baseurl }}/docs/configuring-odbc-on-mac-os-x/). http://git-wip-us.apache.org/repos/asf/drill/blob/e8aba59f/_docs/odbc-jdbc-interfaces/using-drill-explorer/030-browsing-data-and-creating-views.md ---------------------------------------------------------------------- diff --git a/_docs/odbc-jdbc-interfaces/using-drill-explorer/030-browsing-data-and-creating-views.md b/_docs/odbc-jdbc-interfaces/using-drill-explorer/030-browsing-data-and-creating-views.md index aa215c5..482d1fb 100644 --- a/_docs/odbc-jdbc-interfaces/using-drill-explorer/030-browsing-data-and-creating-views.md +++ b/_docs/odbc-jdbc-interfaces/using-drill-explorer/030-browsing-data-and-creating-views.md @@ -95,4 +95,4 @@ The following query displays the same results in string format: `SELECT CAST(column1 AS varchar(20)) FROM `dfs`.`default`.`./opt/drill/test.parquet`` -You can also cast the data as other data types, such as integer or date formats/ +You can also cast the data as other data types, such as integer or date formats. http://git-wip-us.apache.org/repos/asf/drill/blob/e8aba59f/_docs/odbc-jdbc-interfaces/using-drill-with-bi-tools/010-using-odbc-with-bi-tools-introduction.md ---------------------------------------------------------------------- diff --git a/_docs/odbc-jdbc-interfaces/using-drill-with-bi-tools/010-using-odbc-with-bi-tools-introduction.md b/_docs/odbc-jdbc-interfaces/using-drill-with-bi-tools/010-using-odbc-with-bi-tools-introduction.md index ef1f773..41498ad 100644 --- a/_docs/odbc-jdbc-interfaces/using-drill-with-bi-tools/010-using-odbc-with-bi-tools-introduction.md +++ b/_docs/odbc-jdbc-interfaces/using-drill-with-bi-tools/010-using-odbc-with-bi-tools-introduction.md @@ -4,12 +4,12 @@ parent: "Using Drill with BI Tools" --- The MapR Drill ODBC driver provides BI tools access to Drillâs flexible query capabilities so that users can quickly explore various data sources. The MapR -Drill ODBC driver includes Drill Explorer, which is a simple user interface -that enables users to examine the content of data sources and create views +Drill ODBC driver includes Drill Explorer, a simple user interface +for examining the content of data sources and creating views before visualizing the data in a BI tool. -Once you install the MapR Drill ODBC Driver on Windows, you can create ODBC DSNs to Drill -data sources using the ODBC Administrator tool and then use the DSNs to access +After you install the MapR Drill ODBC Driver, you can create ODBC DSNs to Drill +data sources, and then use the DSNs to access the data from BI tools that work with ODBC. Drill can connect to data with well-defined schemas, such as Hive. Drill can also connect directly to data that is self-describing, such as HBase, Parquet, JSON, CSV, and TSV. @@ -21,4 +21,9 @@ access data from a Hive table: The following components provide applications access to Drill data sources: -<table ><tbody><tr><th >Component</th><th >Role</th></tr><tr><td valign="top">Drillbit</td><td valign="top">Accepts queries from clients, executes queries against Drill data sources, and returns the query results. </td></tr><tr><td valign="top">ODBC Data Source Administrator</td><td valign="top">The ODBC Data Source Administrator enables the creation of DSNs to Apache Drill data sources.<br /> In the figure above, the ODBC Data Source Administrator was used to create <code>Hive-DrillDataSources</code>.</td></tr><tr><td valign="top">ODBC DSN</td><td valign="top"><p>Provides applications information about how to connect to the Drill Source.</p>In the figure above, the <code>Hive-DrillDataSources</code> is a DSN that provides connection information to the Hive tables.</td></tr><tr><td colspan="1" valign="top">BI Tool</td><td colspan="1" valign="top"><p>Accesses Drill data sources using the connection information from the ODBC DSN.</p>In the figure above, the BI tool uses <code>Hive-Dri llDataSources</code> to access the <code>hive_student</code> table.</td></tr></tbody></table></div> \ No newline at end of file +| Component | Role | +|--------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Drillbit | Accepts queries from clients, executes queries against Drill data sources, and returns the query results. | +| ODBC Data Source Administrator | The ODBC Data Source Administrator enables the creation of DSNs to Apache Drill data sources. In the figure above, the ODBC Data Source Administrator was used to create Hive-DrillDataSources. | +| ODBC DSN | Provides applications information about how to connect to the Drill Source.In the figure above, the Hive-DrillDataSources is a DSN that provides connection information to the Hive tables. | +| BI Tool | Accesses Drill data sources using the connection information from the ODBC DSN. In the figure above, the BI tool uses Hive-DrillDataSources to access the hive_student table. | \ No newline at end of file http://git-wip-us.apache.org/repos/asf/drill/blob/e8aba59f/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md ---------------------------------------------------------------------- diff --git a/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md b/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md index 4ff5bb2..133bb7d 100644 --- a/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md +++ b/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md @@ -63,12 +63,12 @@ The `dfs` definition includes format definitions. "root": { "location": "/mapr/demo.mapr.com/data", "writable": false, - "defaultinputformat": null + "defaultInputFormat": null }, "clicks": { "location": "/mapr/demo.mapr.com/data/nested", "writable": true, - "defaultinputformat": "parquet" + "defaultInputFormat": "parquet" }, . . . "formats": {
