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/17 02:10:36 UTC
[01/10] drill git commit: update with summit info
Repository: drill
Updated Branches:
refs/heads/gh-pages 596e4f95c -> 3d023e2a3
update with summit info
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/1890c3f9
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/1890c3f9
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/1890c3f9
Branch: refs/heads/gh-pages
Commit: 1890c3f932d3b53e5c76b7cd36a569a3f9647ede
Parents: 596e4f9
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Jun 10 11:21:35 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Jun 10 11:21:35 2015 -0700
----------------------------------------------------------------------
.../010-interfaces-introduction.md | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/1890c3f9/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md b/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
index 4fa1ffa..2fafa26 100644
--- a/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
+++ b/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
@@ -10,21 +10,16 @@ You can connect to Apache Drill through the following interfaces:
* [JDBC]({{ site.baseurl }}/docs/using-jdbc/)
* C++ API
-*Apache Drill does not have an open source ODBC driver. However, MapR provides an ODBC driver that you can use to connect to Apache Drill from BI tools.
+*Apache Drill does not have an open source ODBC driver. However, MapR provides an ODBC 3.8 driver developed specifically for connecting Apache Drill to BI tools.
## Using ODBC to Access Apache Drill from BI Tools
-MapR provides ODBC drivers for Windows, Mac OS X, and Linux. It is recommended
-that you install the latest version of Apache Drill with the latest version of
-the MapR Drill ODBC driver.
-
-For example, if you have Apache Drill 0.8 and a MapR Drill ODBC driver installed on
-your machine, and then you upgrade to Apache Drill 1.0, do not assume that the
+MapR provides an ODBC 3.8 driver that connects Windows, Mac OS X, and Linux to Apache Drill and BI tools. Install the latest version of Apache Drill with the latest version of
+the MapR Drill ODBC driver. For example, if you have Apache Drill 0.8 and a MapR Drill ODBC driver installed on your machine, and you upgrade to Apache Drill 1.0, do not assume that the
MapR Drill ODBC driver installed on your machine will work with the new version of
-Apache Drill. Install the latest available MapR Drill ODBC driver to ensure that
-the two components work together.
+Apache Drill. Use latest MapR Drill ODBC driver and Apache Drill versions.
-You can access the latest MapR Drill ODBC drivers in the following location:
+Access the latest MapR Drill ODBC drivers in the following location:
<http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc>
[04/10] drill git commit: write connect explorer piece
Posted by br...@apache.org.
write connect explorer piece
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/2b3ab5fd
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/2b3ab5fd
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/2b3ab5fd
Branch: refs/heads/gh-pages
Commit: 2b3ab5fd9c7644d6022c40a5d616c5fae8d50550
Parents: fff11f5
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Jun 10 11:25:58 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Jun 10 11:25:58 2015 -0700
----------------------------------------------------------------------
_docs/img/odbc-explorer-connect.png | Bin 0 -> 9894 bytes
_docs/img/odbc-explorer-win.png | Bin 0 -> 25610 bytes
.../020-connecting-drill-explorer-to-data.md | 30 +++++++++++++++----
3 files changed, 25 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/2b3ab5fd/_docs/img/odbc-explorer-connect.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-explorer-connect.png b/_docs/img/odbc-explorer-connect.png
new file mode 100644
index 0000000..f11b920
Binary files /dev/null and b/_docs/img/odbc-explorer-connect.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/2b3ab5fd/_docs/img/odbc-explorer-win.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-explorer-win.png b/_docs/img/odbc-explorer-win.png
new file mode 100644
index 0000000..5d37cc9
Binary files /dev/null and b/_docs/img/odbc-explorer-win.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/2b3ab5fd/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md b/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
index b5257e0..ca77280 100644
--- a/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
+++ b/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
@@ -2,7 +2,7 @@
title: "Connecting Drill Explorer to Data"
parent: "Using Drill Explorer"
---
-The way you start Drill Explorer differs depending on your platform, but regardless of the platform, Drill must be running. On a single-node, embedded Drill cluster, start the Drill shell. On a distributed Drill cluster, start the Drillbit.
+The way you start Drill Explorer differs depending on your platform, but regardless of the platform, Drill must be running. On a single-node, embedded Drill cluster, [start the Drill shell]({{site.baseurl}}/docs/installing-drill-in-embedded-mode/). On a distributed Drill cluster, [start the Drillbit]({{site.baseurl}}/docs/starting-drill-in-distributed-mode/).
## Connecting Drill Explorer to Data on Mac OS X
@@ -21,11 +21,31 @@ The way you start Drill Explorer differs depending on your platform, but regardl
## Starting Drill Explorer on Windows
-1. To launch the ODBC Administrator, click **Start > All Programs > MapR Drill ODBC Driver 1.0 (32|64-bit) > (32|64-bit) ODBC Administrator**.
-2. Click the **User DSN** tab or the **System DSN** tab and then select the DSN that corresponds to the Drill data source that you want to explore.
+You can start Drill Explorer from Apps or from the ODBC Administrator.
+
+To start Drill Explorer from Apps:
+
+1. Click **Start**, and locate the MaprR Drill ODBC Driver 1.0 app group in Apps.
+ The MapR Drill ODBC Driver 1.0 group includes Drill Explorer.
+ 
+
+2. Click **Drill Explorer**.
+ The ODBC Connection dialog appears.
+3. Select the DSN that you want to explore. For example, select the sample MapR ODBC Driver for Drill DSN.
+ 
+ Drill Explorer appears.
+ 
+
+To start Drill Explorer from the ODBC Administrator:
+
+1. In ODBC Administrator, on the **System DSN** tab in System Data Sources, select MapR ODBC Driver for Drill DSN.
+ 
+ Alternatively, if you set up a user DSN, select **User DSN**, and select the configured Driver.
3. Click **Configure**.
- The _MapR Drill ODBC Driver DSN Setup_ dialog appears.
-4. Click **Drill Explorer**.
+ The MapR Drill ODBC Driver DSN Setup dialog appears with a preconfigured sample DSN.
+ 
+4. Click **Drill Explorer** at the bottom of the MapR Drill ODBC Driver DSN Setup dialog.
+ Drill Explorer appears.
[05/10] drill git commit: change title
Posted by br...@apache.org.
change title
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/61e05007
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/61e05007
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/61e05007
Branch: refs/heads/gh-pages
Commit: 61e0500782af6d023ba9db0d11e720329440301f
Parents: 2b3ab5f
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Jun 10 11:27:21 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Jun 10 11:27:21 2015 -0700
----------------------------------------------------------------------
.../using-drill-explorer/030-browsing-data-and-creating-views.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/61e05007/_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 2151a3f..3dd162c 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
@@ -1,5 +1,5 @@
---
-title: "Using Drill Explorer to Browse Data"
+title: "Browsing Data and Creating Views"
parent: "Using Drill Explorer"
---
After connecting Drill Explorer to data, the Browse and SQL tab appear on the right side of the console. On the Browse tab, you view any metadata that might exist for a schema that you access with Drill. On the SQL tab, you preview the results
[06/10] drill git commit: minor edits
Posted by br...@apache.org.
minor edits
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/36d3a5c0
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/36d3a5c0
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/36d3a5c0
Branch: refs/heads/gh-pages
Commit: 36d3a5c09f7b48380fa67a7279474eabc9dcede9
Parents: 61e0500
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Jun 10 11:51:37 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Jun 10 11:51:37 2015 -0700
----------------------------------------------------------------------
_docs/img/explorer-nation-data.png | Bin 96528 -> 76821 bytes
_docs/img/odbc-explorer-connect.png | Bin 9894 -> 10233 bytes
.../020-connecting-drill-explorer-to-data.md | 8 ++++----
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/36d3a5c0/_docs/img/explorer-nation-data.png
----------------------------------------------------------------------
diff --git a/_docs/img/explorer-nation-data.png b/_docs/img/explorer-nation-data.png
index d84cf12..485b7c6 100644
Binary files a/_docs/img/explorer-nation-data.png and b/_docs/img/explorer-nation-data.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/36d3a5c0/_docs/img/odbc-explorer-connect.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-explorer-connect.png b/_docs/img/odbc-explorer-connect.png
index f11b920..960e963 100644
Binary files a/_docs/img/odbc-explorer-connect.png and b/_docs/img/odbc-explorer-connect.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/36d3a5c0/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md b/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
index ca77280..e901e79 100644
--- a/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
+++ b/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
@@ -38,13 +38,13 @@ To start Drill Explorer from Apps:
To start Drill Explorer from the ODBC Administrator:
-1. In ODBC Administrator, on the **System DSN** tab in System Data Sources, select MapR ODBC Driver for Drill DSN.
+1. In ODBC Administrator, on the **System DSN** tab in System Data Sources, a DSN. For example, select the sample MapR ODBC Driver for Drill DSN.
- Alternatively, if you set up a user DSN, select **User DSN**, and select the configured Driver.
+ Alternatively, if you set up a user DSN, select **User DSN**, and select a DSN.
3. Click **Configure**.
- The MapR Drill ODBC Driver DSN Setup dialog appears with a preconfigured sample DSN.
+ The DSN Setup dialog appears showing the configured properties.
-4. Click **Drill Explorer** at the bottom of the MapR Drill ODBC Driver DSN Setup dialog.
+4. Click **Drill Explorer** at the bottom of the dialog.
Drill Explorer appears.
[02/10] drill git commit: editorial
Posted by br...@apache.org.
editorial
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/42e6b1eb
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/42e6b1eb
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/42e6b1eb
Branch: refs/heads/gh-pages
Commit: 42e6b1ebff4ec4e31c2a8a503982a7ecb9b08b5d
Parents: 1890c3f
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Jun 10 11:22:03 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Jun 10 11:22:03 2015 -0700
----------------------------------------------------------------------
.../010-drill-explorer-introduction.md | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/42e6b1eb/_docs/odbc-jdbc-interfaces/using-drill-explorer/010-drill-explorer-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-drill-explorer/010-drill-explorer-introduction.md b/_docs/odbc-jdbc-interfaces/using-drill-explorer/010-drill-explorer-introduction.md
index 5dea097..fe0b93d 100644
--- a/_docs/odbc-jdbc-interfaces/using-drill-explorer/010-drill-explorer-introduction.md
+++ b/_docs/odbc-jdbc-interfaces/using-drill-explorer/010-drill-explorer-introduction.md
@@ -5,21 +5,10 @@ parent: "Using Drill Explorer"
Drill Explorer is a user interface for browsing Drill data
sources, previewing the results of a SQL query, and creating a view. Typically, you use Drill Explorer to explore data or to
-create a view before you connect to the data from a BI tool. For example, before designing a report using a BI reporting tool, use Drill Explorer to familiarize yourself with the data. In an ODBC-compliant BI tool, use the ODBC DSN to create an ODBC connection
-with one of the methods applicable to the data source type.
+create a view that you can query as if it were a table. For example, before designing a report using a BI reporting tool, use Drill Explorer to quickly familiarize yourself with the data. In an ODBC-compliant BI tool, use the ODBC DSN to create an ODBC connection.
-To connect Drill to a Hive data source, follow these steps:
+You can connect Drill to a Hive data source, use Drill Explorer to create a view, and connect to the view as if it were a table. Similarly, you can connect Drill to HBase, Parquet, JSON, CSV, or TSV files, create a view, and query the view as if it were a table.
-1. Connect to a Hive table.
-2. Use Drill Explorer to create a view.
-3. Connect to the view as if it were a table.
-
-To connect Drill to an HBase, Parquet, JSON, CSV, or TSV, follow these steps:
-
-1. Use Drill Explorer to create a view.
-2. Use ODBC to connect to the view as if it were a table.
-3. Use Drill Explorer to query the table.
-
{% include startnote.html %}The default schema that you configure in the DSN may or may not carry over to an application’s data source connections. You may need to re-select the schema.{% include endnote.html %}
[08/10] drill git commit: DRILL-3276
Posted by br...@apache.org.
DRILL-3276
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/e3199552
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/e3199552
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/e3199552
Branch: refs/heads/gh-pages
Commit: e3199552e3219d31885179055d0870ed91f06d13
Parents: 5dc90cd
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Jun 10 15:58:18 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Jun 10 15:58:18 2015 -0700
----------------------------------------------------------------------
_docs/sql-reference/sql-functions/020-data-type-conversion.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/e3199552/_docs/sql-reference/sql-functions/020-data-type-conversion.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-functions/020-data-type-conversion.md b/_docs/sql-reference/sql-functions/020-data-type-conversion.md
index 6028ffa..77466a3 100644
--- a/_docs/sql-reference/sql-functions/020-data-type-conversion.md
+++ b/_docs/sql-reference/sql-functions/020-data-type-conversion.md
@@ -30,8 +30,8 @@ Use CONVERT_TO and CONVERT_FROM instead of the CAST function for converting bina
Refer to the following tables for information about the data types to use for casting:
-* [Supported Data Types for Casting]({{ site.baseurl }}/docs/supported-data-types-for-casting)
-* [Explicit Type Casting Maps]({{ site.baseurl }}/docs/explicit-type-casting-maps)
+* [Supported Data Types for Casting]({{ site.baseurl }}/docs/supported-data-types)
+* [Explicit Type Casting Maps]({{ site.baseurl }}/docs/supported-data-types/#explicit-type-casting-maps)
## Data Type Conversion Examples
[09/10] drill git commit: squash 9 commits DRILL-3078
Posted by br...@apache.org.
squash 9 commits DRILL-3078
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/e3262a54
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/e3262a54
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/e3262a54
Branch: refs/heads/gh-pages
Commit: e3262a54dfcf84ad8c5a97a3ab7140909ee73225
Parents: e319955
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Mon Jun 15 16:51:41 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Mon Jun 15 16:51:41 2015 -0700
----------------------------------------------------------------------
_data/docs.json | 82 +++++++-------
_docs/img/odbc-create-as.png | Bin 0 -> 18582 bytes
_docs/img/odbc-define-view.png | Bin 0 -> 88744 bytes
.../010-odbc-configuration-reference.md | 12 ++-
.../020-configuring-odbc-on-linux-mac-os-x.md | 25 ++---
.../010-installing-the-driver-on-linux.md | 23 ++--
.../020-connecting-drill-explorer-to-data.md | 2 +-
.../030-browsing-data-and-creating-views.md | 107 ++++++++++++++-----
8 files changed, 152 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/e3262a54/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index bf8a6d6..1e0c55c 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -547,6 +547,27 @@
"title": "Archived Pages",
"url": "/docs/archived-pages/"
},
+ "Browsing Data and Defining Views": {
+ "breadcrumbs": [
+ {
+ "title": "Using Drill Explorer",
+ "url": "/docs/using-drill-explorer/"
+ },
+ {
+ "title": "ODBC/JDBC Interfaces",
+ "url": "/docs/odbc-jdbc-interfaces/"
+ }
+ ],
+ "children": [],
+ "next_title": "Using Drill with BI Tools",
+ "next_url": "/docs/using-drill-with-bi-tools/",
+ "parent": "Using Drill Explorer",
+ "previous_title": "Connecting Drill Explorer to Data",
+ "previous_url": "/docs/connecting-drill-explorer-to-data/",
+ "relative_path": "_docs/odbc-jdbc-interfaces/using-drill-explorer/030-browsing-data-and-creating-views.md",
+ "title": "Browsing Data and Defining Views",
+ "url": "/docs/browsing-data-and-defining-views/"
+ },
"CASE": {
"breadcrumbs": [
{
@@ -1696,8 +1717,8 @@
}
],
"children": [],
- "next_title": "Using Drill Explorer to Browse Data",
- "next_url": "/docs/using-drill-explorer-to-browse-data/",
+ "next_title": "Browsing Data and Defining Views",
+ "next_url": "/docs/browsing-data-and-defining-views/",
"parent": "Using Drill Explorer",
"previous_title": "Drill Explorer Introduction",
"previous_url": "/docs/drill-explorer-introduction/",
@@ -5107,8 +5128,8 @@
}
],
"children": [],
- "next_title": "Using Drill Explorer to Browse Data",
- "next_url": "/docs/using-drill-explorer-to-browse-data/",
+ "next_title": "Browsing Data and Defining Views",
+ "next_url": "/docs/browsing-data-and-defining-views/",
"parent": "Using Drill Explorer",
"previous_title": "Drill Explorer Introduction",
"previous_url": "/docs/drill-explorer-introduction/",
@@ -5134,8 +5155,8 @@
"previous_title": "Connecting Drill Explorer to Data",
"previous_url": "/docs/connecting-drill-explorer-to-data/",
"relative_path": "_docs/odbc-jdbc-interfaces/using-drill-explorer/030-browsing-data-and-creating-views.md",
- "title": "Using Drill Explorer to Browse Data",
- "url": "/docs/using-drill-explorer-to-browse-data/"
+ "title": "Browsing Data and Defining Views",
+ "url": "/docs/browsing-data-and-defining-views/"
}
],
"next_title": "Drill Explorer Introduction",
@@ -5285,8 +5306,8 @@
"next_title": "Using Drill with BI Tools Introduction",
"next_url": "/docs/using-drill-with-bi-tools-introduction/",
"parent": "ODBC/JDBC Interfaces",
- "previous_title": "Using Drill Explorer to Browse Data",
- "previous_url": "/docs/using-drill-explorer-to-browse-data/",
+ "previous_title": "Browsing Data and Defining Views",
+ "previous_url": "/docs/browsing-data-and-defining-views/",
"relative_path": "_docs/odbc-jdbc-interfaces/060-using-drill-with-bi-tools.md",
"title": "Using Drill with BI Tools",
"url": "/docs/using-drill-with-bi-tools/"
@@ -10270,8 +10291,8 @@
}
],
"children": [],
- "next_title": "Using Drill Explorer to Browse Data",
- "next_url": "/docs/using-drill-explorer-to-browse-data/",
+ "next_title": "Browsing Data and Defining Views",
+ "next_url": "/docs/browsing-data-and-defining-views/",
"parent": "Using Drill Explorer",
"previous_title": "Drill Explorer Introduction",
"previous_url": "/docs/drill-explorer-introduction/",
@@ -10297,8 +10318,8 @@
"previous_title": "Connecting Drill Explorer to Data",
"previous_url": "/docs/connecting-drill-explorer-to-data/",
"relative_path": "_docs/odbc-jdbc-interfaces/using-drill-explorer/030-browsing-data-and-creating-views.md",
- "title": "Using Drill Explorer to Browse Data",
- "url": "/docs/using-drill-explorer-to-browse-data/"
+ "title": "Browsing Data and Defining Views",
+ "url": "/docs/browsing-data-and-defining-views/"
}
],
"next_title": "Drill Explorer Introduction",
@@ -10310,27 +10331,6 @@
"title": "Using Drill Explorer",
"url": "/docs/using-drill-explorer/"
},
- "Using Drill Explorer to Browse Data": {
- "breadcrumbs": [
- {
- "title": "Using Drill Explorer",
- "url": "/docs/using-drill-explorer/"
- },
- {
- "title": "ODBC/JDBC Interfaces",
- "url": "/docs/odbc-jdbc-interfaces/"
- }
- ],
- "children": [],
- "next_title": "Using Drill with BI Tools",
- "next_url": "/docs/using-drill-with-bi-tools/",
- "parent": "Using Drill Explorer",
- "previous_title": "Connecting Drill Explorer to Data",
- "previous_url": "/docs/connecting-drill-explorer-to-data/",
- "relative_path": "_docs/odbc-jdbc-interfaces/using-drill-explorer/030-browsing-data-and-creating-views.md",
- "title": "Using Drill Explorer to Browse Data",
- "url": "/docs/using-drill-explorer-to-browse-data/"
- },
"Using Drill with BI Tools": {
"breadcrumbs": [
{
@@ -10469,8 +10469,8 @@
"next_title": "Using Drill with BI Tools Introduction",
"next_url": "/docs/using-drill-with-bi-tools-introduction/",
"parent": "ODBC/JDBC Interfaces",
- "previous_title": "Using Drill Explorer to Browse Data",
- "previous_url": "/docs/using-drill-explorer-to-browse-data/",
+ "previous_title": "Browsing Data and Defining Views",
+ "previous_url": "/docs/browsing-data-and-defining-views/",
"relative_path": "_docs/odbc-jdbc-interfaces/060-using-drill-with-bi-tools.md",
"title": "Using Drill with BI Tools",
"url": "/docs/using-drill-with-bi-tools/"
@@ -12143,8 +12143,8 @@
}
],
"children": [],
- "next_title": "Using Drill Explorer to Browse Data",
- "next_url": "/docs/using-drill-explorer-to-browse-data/",
+ "next_title": "Browsing Data and Defining Views",
+ "next_url": "/docs/browsing-data-and-defining-views/",
"parent": "Using Drill Explorer",
"previous_title": "Drill Explorer Introduction",
"previous_url": "/docs/drill-explorer-introduction/",
@@ -12170,8 +12170,8 @@
"previous_title": "Connecting Drill Explorer to Data",
"previous_url": "/docs/connecting-drill-explorer-to-data/",
"relative_path": "_docs/odbc-jdbc-interfaces/using-drill-explorer/030-browsing-data-and-creating-views.md",
- "title": "Using Drill Explorer to Browse Data",
- "url": "/docs/using-drill-explorer-to-browse-data/"
+ "title": "Browsing Data and Defining Views",
+ "url": "/docs/browsing-data-and-defining-views/"
}
],
"next_title": "Drill Explorer Introduction",
@@ -12321,8 +12321,8 @@
"next_title": "Using Drill with BI Tools Introduction",
"next_url": "/docs/using-drill-with-bi-tools-introduction/",
"parent": "ODBC/JDBC Interfaces",
- "previous_title": "Using Drill Explorer to Browse Data",
- "previous_url": "/docs/using-drill-explorer-to-browse-data/",
+ "previous_title": "Browsing Data and Defining Views",
+ "previous_url": "/docs/browsing-data-and-defining-views/",
"relative_path": "_docs/odbc-jdbc-interfaces/060-using-drill-with-bi-tools.md",
"title": "Using Drill with BI Tools",
"url": "/docs/using-drill-with-bi-tools/"
http://git-wip-us.apache.org/repos/asf/drill/blob/e3262a54/_docs/img/odbc-create-as.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-create-as.png b/_docs/img/odbc-create-as.png
new file mode 100644
index 0000000..1abc793
Binary files /dev/null and b/_docs/img/odbc-create-as.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/e3262a54/_docs/img/odbc-define-view.png
----------------------------------------------------------------------
diff --git a/_docs/img/odbc-define-view.png b/_docs/img/odbc-define-view.png
new file mode 100644
index 0000000..70b4af8
Binary files /dev/null and b/_docs/img/odbc-define-view.png differ
http://git-wip-us.apache.org/repos/asf/drill/blob/e3262a54/_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 bf27f88..d5dbe0f 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
@@ -30,7 +30,7 @@ The following table provides a list of the configuration options and a brief des
### Catalog
-This value defaults to DRILL and cannot be changed.
+This value defaults to DRILL and cannot be changed. The driver adds a synthetic catalog named DRILL under which all of the schemas and databases are organized. The driver maps the ODBC schema to the DRILL catalog.
### Connection Type
@@ -83,6 +83,16 @@ Views that you create using the Drill Explorer do not appear under the schema
associated with the data source type. Instead, the views can be accessed from
the file-based schema that you selected when saving the view.
+The driver supports the following schema types:
+
+* HBase
+* Distributed File System (DFS), supporting the following file formats:
+ * Parquet
+ * JSON
+ * CSV
+ * TSV
+* Hive
+
### Advanced Properties
The Advanced Properties field allows you to customize the DSN.
http://git-wip-us.apache.org/repos/asf/drill/blob/e3262a54/_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 d9e85be..f8c122d 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
@@ -20,7 +20,7 @@ on Linux or Mac OS X, copy the following configuration files in `/opt/mapr/drill
* `odbc.ini`
* `odbcinst.ini`
-In your home directory, use sudo to rename the files as hidden files:
+In your home directory, rename the files as hidden files. Use sudo if necessary:
* .mapr.drillodbc.ini
* .odbc.ini
@@ -39,28 +39,17 @@ Depending on the driver manager you use, the user DSN in one of these files will
### Linux
-Set the following environment variables to point to the `.odbc.ini`
-and `.mapr.drillodbc.ini` configuration files, respectively:
-
- * `ODBCINI` (point to `.odbc.ini`)
- * `MAPRDRILLINI` (point to `.mapr.drillodbc.ini`)
-
-The `LD_LIBRARY_PATH` environment variable must include the paths to the
-following:
-
- * Installed ODBC driver manager libraries
- * Installed MapR ODBC Driver for Apache Drill shared libraries
+1. Set the ODBCINI environment variable to point to the `.odbc.ini` in your home directory. For example:
+ `export ODBCINI=~/.odbc.ini`
+2. Set the MAPRDRILLINI environment variable to point to `.mapr.drillodbc.ini` in your home directory. For example:
+ `export MAPRDRILLINI=~/.mapr.drillodbc.ini`
+3. Set the LD_LIBRARY_PATH environment variable to point to your ODBC driver manager libraries and the MapR ODBC Driver for Apache Drill shared libraries. For example:
+ `export LD_LIBRARY_PATH=/usr/local/lib:/opt/mapr/drillodbc/lib/64`
You can have both 32- and 64-bit versions of the driver installed at the same time on the same computer.
{% include startimportant.html %}Do not include the paths to both 32- and 64-bit shared libraries in LD_LIBRARY PATH at the same time.{% include endimportant.html %}
Only include the path to the shared libraries corresponding to the driver matching the bitness of the client application used.
-For example, if you are using a 64-bit client application and ODBC driver
-manager libraries are installed in `/usr/local/lib`, then set
-`LD_LIBRARY_PATH` as follows:
-
-`export LD_LIBRARY_PATH=/usr/local/lib:/opt/simba/drillodbc/lib/64`
-
### Mac OS X
Create or modify the `/etc/launchd.conf` file to set environment variables. Set the SIMBAINI variable to point to the `.mapr.drillodbc.ini` file, the ODBCSYSINI varialbe to the `.odbcinst.ini` file, the ODBCINI variable to the `.odbc.ini` file, and the DYLD_LIBRARY_PATH to the location of the dynamic linker (DYLD) libraries and to the MapR Drill ODBC Driver. If you installed the iODBC driver manager using the DMG, the DYLD libraries are installed in `/usr/local/iODBC/lib`. The launchd.conf file should look something like this:
http://git-wip-us.apache.org/repos/asf/drill/blob/e3262a54/_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 a9d57ba..32a6719 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
@@ -27,6 +27,7 @@ Verify that your system meets the system requirements before you start.
* iODBC 3.52.7 or above
OR
* unixODBC 2.2.12 or above
+ On Linux, 3.52.7 is available as a tarball. After unpacking the tarball, see the README for instructions about building the driver manager.
* 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 in `/etc/hosts` for the Drill node(s):
@@ -37,10 +38,11 @@ To install the driver, you need Administrator privileges on the computer.
## Step 1: Download the MapR Drill ODBC Driver
-Click on a link below to download the driver:
+ * [MapR Drill ODBC Driver (32-bit)]
- * [MapR Drill ODBC Driver (32-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.0.0.1001/MapRDrillODBC-32bit-1.0.0.i686.rpm)
- * [MapR Drill ODBC Driver (64-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.0.0.1001/MapRDrillODBC-1.0.0.x86_64.rpm)
+ wget http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.0.0.1001/MapRDrillODBC-32bit-1.0.0.i686.rpm
+ * [MapR Drill ODBC Driver (64-bit)]
+ wget http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/MapRDrill_odbc_v1.0.0.1001/MapRDrillODBC-1.0.0.x86_64.rpm
## Step 2: Install the MapR Drill ODBC Driver
@@ -52,23 +54,20 @@ To install the driver, complete the following steps:
**RedHat/CentOS**
- `yum localinstall --nogpgcheck RPMFileName`
+ `yum localinstall --nogpgcheck <RPMFileName>`
**SUSE**
`zypper install RPMFileName`
-{% include startnote.html %}The MapR Drill ODBC Driver dependencies need to be resolved.{% include endnote.html %}
-
The MapR Drill ODBC Driver depends on the following resources:
* `cyrus-sasl-2.1.22-7` or above
* `cyrus-sasl-gssapi-2.1.22-7` or above
* `cyrus-sasl-plain-2.1.22-7` or above
-If the package manager in your Linux distribution cannot resolve the
-dependencies automatically when installing the driver, download and manually
-install the packages.
+The MapR Drill ODBC Driver typically resolves dependencies automatically. If not, error messages during the installation indicate that the package manager in your Linux distribution cannot resolve the
+dependencies automatically. In this case, manually install the packages.
The following table provides a list of the MapR Drill ODBC Driver file
locations and descriptions:
@@ -82,13 +81,13 @@ File| Description
## Step 3: Check the MapR Drill ODBC Driver version
-To check the version of the driver you installed, use the following command on the terminal command line:
+To check the version of the driver you installed, use the following case-sensitive command on the terminal command line:
-`yum list | grep maprdrillodbc`
+`yum list | grep MapRDrillODBC`
or
-`rpm -qa | grep maprdrillodbc`
+`rpm -qa | grep MapRDrillodbc`
### Next Step
http://git-wip-us.apache.org/repos/asf/drill/blob/e3262a54/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md b/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
index e901e79..81475bf 100644
--- a/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
+++ b/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
@@ -6,7 +6,7 @@ The way you start Drill Explorer differs depending on your platform, but regardl
## Connecting Drill Explorer to Data on Mac OS X
-1. On a node that is running Drill, go to the `/Applications` directory, and run the Drill Explorer app.
+1. On a node that is running Drill, run Drill Explorer. The Drill Explorer app is located in the `/Applications` directory.
The Drill Explorer console appears.
2. Click **Connect** on the console.
The Drill Explorer dialog appears.
http://git-wip-us.apache.org/repos/asf/drill/blob/e3262a54/_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 3dd162c..aa215c5 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
@@ -1,43 +1,98 @@
---
-title: "Browsing Data and Creating Views"
+title: "Browsing Data and Defining Views"
parent: "Using Drill Explorer"
---
-After connecting Drill Explorer to data, the Browse and SQL tab appear on the right side of the console. On the Browse tab, you view any metadata that might exist for a schema that you access with Drill. On the SQL tab, you preview the results
+After connecting Drill Explorer to data, the Browse and SQL tabs appear on the right side of the console. On the Browse tab, you view any metadata that might exist for a schema that you access with Drill. On the SQL tab, you preview the results
of custom queries and save the results as a view.
## Browsing Data
-You can browse files and directories if you have permission to read them. The following example shows how browse Drill sample data.
+You can browse files and directories if you have permission to read them. In the Schemas pane, you expand branches until you find the file or table you want to view, and then select it.
+
+Tip: To avoid error messages, which you can ignore, expand directories carefully by clicking on the arrow instead of the directory name until you find valid data.
+
+In the Browse tab, the Metadata pane displays the structure, if there is any, of the selected table or file. The Preview pane displays the actual data. The SQL tab displays the statement that returns the data you see in the Browse tab.
+
+To update data after making changes in the data source, right-click a file, table, view, schema, or directory in the Schemas pane, and select Refresh. The scope of the update is limited to the item you right-click.
+
+The following example shows how to browse data using the sample MapR ODBC Driver DSN.
1. Start Drill if necessary.
-2. Check that the Schema property in the `.odbc.ini` is blank, which puts the default `dfs` schema into effect.
-3. Start Drill Explorer and connect to the sample DSN.
-4. In the **Schemas** section of Drill Explorer, on the **Browse** tab, navigate to the ` Drill installation directory, to the `sample-data` directory. Click `nation.parquet`.
+2. Start Drill Explorer and connect to the sample DSN.
+3. In the **Schemas** pane of Drill Explorer, on the **Browse** tab, navigate to the `sample-data` directory in the dfs.default schema. Click `nation.parquet`.
+ The data from `nation.parquet` appears in the Preview pane.
-## Creating a View
+## Defining a View
+After browsing data, you can define, preview, and save a view of file-based data. On the SQL tab, modify the statement in View Definition SQL to select the data you want to view. Click **Create As** to navigate to the location for saving the view. You need to save the view to a location that you define as `writable` in the storage plugin definition. After saving a view, a message is displayed about the status of the operation. Click **Copy** to copy the message.
-1. Start Drill if necessary.
-2. Check that the Schema property in the .odbc.ini is blank, which puts the default `dfs`schema into effect.
-3. Start Drill Explorer and connect to the sample DSN.
-4. In the **Schemas** section on the **Browse** tab, navigate to the the data source that you want to create a view for.
- After you select a data souce, the metadata and data displays on the Browse tab and the SQL that is used to access the data displays on the SQL tab.
-5. Click the **SQL** tab.
-6. In the **View Definition SQL** field, enter the SQL query that you want to create a view for.
-7. Click **Preview**.
- If the results are not as expected, you can edit the SQL query and click
-Preview again.
-8. Click **Create As**.
- The _Create As_ dialog displays.
-9. In the **Schema** field, select the schema where you want to save the view.
+The following example defines and saves a view of a few columns of `nation.parquet` data.
+
+1. Start Drill.
+2. Start Drill Explorer and connect to the sample DSN.
+3. In the **Schemas** section on the **Browse** tab, navigate to the `/sample-data/nation.parquet` in the `dfs.default` schema.
+4. On the **SQL** tab, in the **View Definition SQL** field, enter a query, as described in the [Specifying Column Names](). For example, modify the SELECT statement as follows:
+
+ SELECT N_NAME, N_REGIONKEY FROM `dfs.default`.`./Users/drilluser/drill/apache-drill-1.0.0/sample-data/nation.parquet` WHERE N_REGIONKEY IN (2, 4)
+ Do not put a semicolon at the end of the SQL statement.
+5. Click **Preview**.
+ 
+6. Click **Create As**.
+ The _Create As_ dialog is displayed.
+ 
+7. From the list of schemas, select the schema that defines the location for saving the view. For example, accept the [dfs.tmp]({{site.baseurl}}/docs/query-directory-functions/#query-directory-function-example) schema because the default `dfs` storage plugin defines the `tmp` directory as writable.
You can save views only to file-based schemas.
-10. In the **View Name** field, enter a descriptive name for the view.
+8. In **View Name**, enter a name for the view.
Do not include spaces in the view name.
-11. Click **Save**.
- The status and any error message associated with the view creation displays in
-the Create As dialog. When a view saves successfully, the Save button changes
-to a Close button.
-12. Click **Close**.
+9. Click **Save** and check **Overwrite Existing Views** if you want to save over an existing view.
+ The status message associated appears.
+10. Click **Close**.
+
+Views that you create using the Drill Explorer do not appear under the schema
+associated with the data source type. Access the views from
+the file-based schema that you selected when saving the view.
+
+## Specifying Column Names
+
+Use of the SQL asterisk (*) selector to return all columns in a table is limited. Tableau might not connect to your Drill data source successfully using
+the SQL view that Drill Explorer creates. Modify the
+queries generated by Drill Explorer to specify columns to return based on the following
+syntax guidelines, depending on the schema type or file format.
+
+Specify individual columns when defining a view in Drill Explorer instead of attempting to select all, as shown in the following examples.
+
+`SELECT CAST(account['name'] AS varchar(20)) FROM hbase.students`
+
+`SELECT CAST(column1 AS varchar(20)) FROM `dfs`.`default`.`./opt/drill/test.parquet``
+
+`SELECT column1 FROM `dfs`.`default`.`./opt/drill/interval.json``
+
+To query nested elements, use the following syntax, where menu is a child of column1:
+
+`SELECT column1['menu'] FROM `dfs`.`default`.`./opt/drill/interval.json``
+
+You can query elements that are multiple levels deep. Continuing the example, if
+menuitem is a child of menu, then use the following syntax:
+
+`SELECT column1['menu']['menuitem'] FROM `dfs`.`default`.`./opt/drill/interval.json``
+
+## Casting Data Requirements
+
+In SQL statements, you need to cast
+binary data to another format explicitly to view the data. For example, the following query
+displays results from an HBase database in binary format:
+`SELECT account['name'] FROM hbase.students`
+
+The following query displays the same results in string format:
+`SELECT CAST(account['name'] AS varchar(20)) FROM
+hbase.students`
+
+The following query displays results from a Parquet file in binary format:
+`SELECT column1 FROM `dfs`.`default`.`./opt/drill/test.parquet``
+
+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/
[10/10] drill git commit: DRILL-3078
Posted by br...@apache.org.
DRILL-3078
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/3d023e2a
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/3d023e2a
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/3d023e2a
Branch: refs/heads/gh-pages
Commit: 3d023e2a364adc93bd60a78d9bd74019355c1044
Parents: e3262a5
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Tue Jun 16 16:45:17 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Tue Jun 16 16:45:17 2015 -0700
----------------------------------------------------------------------
_data/docs.json | 166 ++++++++++++----
.../050-starting-drill-in-distributed mode.md | 87 ---------
.../050-starting-drill-in-distributed-mode.md | 87 +++++++++
.../010-interfaces-introduction.md | 7 +-
.../020-configuring-odbc-on-linux-mac-os-x.md | 180 -----------------
.../020-configuring-odbc-on-linux.md | 192 +++++++++++++++++++
.../025-configuring-odbc-on-mac-os-x.md | 183 ++++++++++++++++++
.../030-configuring-odbc-on-windows.md | 23 +--
.../040-testing-the-odbc-connection.md | 61 ++++--
.../010-installing-the-driver-on-linux.md | 26 ++-
.../020-installing-the-driver-on-mac-os-x.md | 14 +-
.../030-installing-the-driver-on-windows.md | 15 +-
.../020-connecting-drill-explorer-to-data.md | 6 +-
13 files changed, 679 insertions(+), 368 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_data/docs.json
----------------------------------------------------------------------
diff --git a/_data/docs.json b/_data/docs.json
index 1e0c55c..491fddc 100644
--- a/_data/docs.json
+++ b/_data/docs.json
@@ -1165,8 +1165,8 @@
}
],
"children": [],
- "next_title": "Configuring ODBC on Linux/Mac OS X",
- "next_url": "/docs/configuring-odbc-on-linux-mac-os-x/",
+ "next_title": "Configuring ODBC on Linux",
+ "next_url": "/docs/configuring-odbc-on-linux/",
"parent": "Configuring ODBC",
"previous_title": "Configuring ODBC",
"previous_url": "/docs/configuring-odbc/",
@@ -1186,14 +1186,35 @@
}
],
"children": [],
- "next_title": "Configuring ODBC on Windows",
- "next_url": "/docs/configuring-odbc-on-windows/",
+ "next_title": "Configuring ODBC on Mac OS X",
+ "next_url": "/docs/configuring-odbc-on-mac-os-x/",
"parent": "Configuring ODBC",
"previous_title": "ODBC Configuration Reference",
"previous_url": "/docs/odbc-configuration-reference/",
- "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md",
- "title": "Configuring ODBC on Linux/Mac OS X",
- "url": "/docs/configuring-odbc-on-linux-mac-os-x/"
+ "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md",
+ "title": "Configuring ODBC on Linux",
+ "url": "/docs/configuring-odbc-on-linux/"
+ },
+ {
+ "breadcrumbs": [
+ {
+ "title": "Configuring ODBC",
+ "url": "/docs/configuring-odbc/"
+ },
+ {
+ "title": "ODBC/JDBC Interfaces",
+ "url": "/docs/odbc-jdbc-interfaces/"
+ }
+ ],
+ "children": [],
+ "next_title": "Configuring ODBC on Windows",
+ "next_url": "/docs/configuring-odbc-on-windows/",
+ "parent": "Configuring ODBC",
+ "previous_title": "Configuring ODBC on Linux",
+ "previous_url": "/docs/configuring-odbc-on-linux/",
+ "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md",
+ "title": "Configuring ODBC on Mac OS X",
+ "url": "/docs/configuring-odbc-on-mac-os-x/"
},
{
"breadcrumbs": [
@@ -1210,8 +1231,8 @@
"next_title": "Testing the ODBC Connection",
"next_url": "/docs/testing-the-odbc-connection/",
"parent": "Configuring ODBC",
- "previous_title": "Configuring ODBC on Linux/Mac OS X",
- "previous_url": "/docs/configuring-odbc-on-linux-mac-os-x/",
+ "previous_title": "Configuring ODBC on Mac OS X",
+ "previous_url": "/docs/configuring-odbc-on-mac-os-x/",
"relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md",
"title": "Configuring ODBC on Windows",
"url": "/docs/configuring-odbc-on-windows/"
@@ -1247,7 +1268,7 @@
"title": "Configuring ODBC",
"url": "/docs/configuring-odbc/"
},
- "Configuring ODBC on Linux/Mac OS X": {
+ "Configuring ODBC on Linux": {
"breadcrumbs": [
{
"title": "Configuring ODBC",
@@ -1259,14 +1280,35 @@
}
],
"children": [],
- "next_title": "Configuring ODBC on Windows",
- "next_url": "/docs/configuring-odbc-on-windows/",
+ "next_title": "Configuring ODBC on Mac OS X",
+ "next_url": "/docs/configuring-odbc-on-mac-os-x/",
"parent": "Configuring ODBC",
"previous_title": "ODBC Configuration Reference",
"previous_url": "/docs/odbc-configuration-reference/",
- "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md",
- "title": "Configuring ODBC on Linux/Mac OS X",
- "url": "/docs/configuring-odbc-on-linux-mac-os-x/"
+ "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md",
+ "title": "Configuring ODBC on Linux",
+ "url": "/docs/configuring-odbc-on-linux/"
+ },
+ "Configuring ODBC on Mac OS X": {
+ "breadcrumbs": [
+ {
+ "title": "Configuring ODBC",
+ "url": "/docs/configuring-odbc/"
+ },
+ {
+ "title": "ODBC/JDBC Interfaces",
+ "url": "/docs/odbc-jdbc-interfaces/"
+ }
+ ],
+ "children": [],
+ "next_title": "Configuring ODBC on Windows",
+ "next_url": "/docs/configuring-odbc-on-windows/",
+ "parent": "Configuring ODBC",
+ "previous_title": "Configuring ODBC on Linux",
+ "previous_url": "/docs/configuring-odbc-on-linux/",
+ "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md",
+ "title": "Configuring ODBC on Mac OS X",
+ "url": "/docs/configuring-odbc-on-mac-os-x/"
},
"Configuring ODBC on Windows": {
"breadcrumbs": [
@@ -1283,8 +1325,8 @@
"next_title": "Testing the ODBC Connection",
"next_url": "/docs/testing-the-odbc-connection/",
"parent": "Configuring ODBC",
- "previous_title": "Configuring ODBC on Linux/Mac OS X",
- "previous_url": "/docs/configuring-odbc-on-linux-mac-os-x/",
+ "previous_title": "Configuring ODBC on Mac OS X",
+ "previous_url": "/docs/configuring-odbc-on-mac-os-x/",
"relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md",
"title": "Configuring ODBC on Windows",
"url": "/docs/configuring-odbc-on-windows/"
@@ -3599,7 +3641,7 @@
"parent": "Installing Drill in Distributed Mode",
"previous_title": "Installing Drill on the Cluster",
"previous_url": "/docs/installing-drill-on-the-cluster/",
- "relative_path": "_docs/install/050-starting-drill-in-distributed mode.md",
+ "relative_path": "_docs/install/050-starting-drill-in-distributed-mode.md",
"title": "Starting Drill in Distributed Mode",
"url": "/docs/starting-drill-in-distributed-mode/"
}
@@ -3707,7 +3749,7 @@
"parent": "Installing Drill in Distributed Mode",
"previous_title": "Installing Drill on the Cluster",
"previous_url": "/docs/installing-drill-on-the-cluster/",
- "relative_path": "_docs/install/050-starting-drill-in-distributed mode.md",
+ "relative_path": "_docs/install/050-starting-drill-in-distributed-mode.md",
"title": "Starting Drill in Distributed Mode",
"url": "/docs/starting-drill-in-distributed-mode/"
}
@@ -4837,8 +4879,8 @@
}
],
"children": [],
- "next_title": "Configuring ODBC on Linux/Mac OS X",
- "next_url": "/docs/configuring-odbc-on-linux-mac-os-x/",
+ "next_title": "Configuring ODBC on Linux",
+ "next_url": "/docs/configuring-odbc-on-linux/",
"parent": "Configuring ODBC",
"previous_title": "Configuring ODBC",
"previous_url": "/docs/configuring-odbc/",
@@ -5005,8 +5047,8 @@
}
],
"children": [],
- "next_title": "Configuring ODBC on Linux/Mac OS X",
- "next_url": "/docs/configuring-odbc-on-linux-mac-os-x/",
+ "next_title": "Configuring ODBC on Linux",
+ "next_url": "/docs/configuring-odbc-on-linux/",
"parent": "Configuring ODBC",
"previous_title": "Configuring ODBC",
"previous_url": "/docs/configuring-odbc/",
@@ -5026,14 +5068,35 @@
}
],
"children": [],
- "next_title": "Configuring ODBC on Windows",
- "next_url": "/docs/configuring-odbc-on-windows/",
+ "next_title": "Configuring ODBC on Mac OS X",
+ "next_url": "/docs/configuring-odbc-on-mac-os-x/",
"parent": "Configuring ODBC",
"previous_title": "ODBC Configuration Reference",
"previous_url": "/docs/odbc-configuration-reference/",
- "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md",
- "title": "Configuring ODBC on Linux/Mac OS X",
- "url": "/docs/configuring-odbc-on-linux-mac-os-x/"
+ "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md",
+ "title": "Configuring ODBC on Linux",
+ "url": "/docs/configuring-odbc-on-linux/"
+ },
+ {
+ "breadcrumbs": [
+ {
+ "title": "Configuring ODBC",
+ "url": "/docs/configuring-odbc/"
+ },
+ {
+ "title": "ODBC/JDBC Interfaces",
+ "url": "/docs/odbc-jdbc-interfaces/"
+ }
+ ],
+ "children": [],
+ "next_title": "Configuring ODBC on Windows",
+ "next_url": "/docs/configuring-odbc-on-windows/",
+ "parent": "Configuring ODBC",
+ "previous_title": "Configuring ODBC on Linux",
+ "previous_url": "/docs/configuring-odbc-on-linux/",
+ "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md",
+ "title": "Configuring ODBC on Mac OS X",
+ "url": "/docs/configuring-odbc-on-mac-os-x/"
},
{
"breadcrumbs": [
@@ -5050,8 +5113,8 @@
"next_title": "Testing the ODBC Connection",
"next_url": "/docs/testing-the-odbc-connection/",
"parent": "Configuring ODBC",
- "previous_title": "Configuring ODBC on Linux/Mac OS X",
- "previous_url": "/docs/configuring-odbc-on-linux-mac-os-x/",
+ "previous_title": "Configuring ODBC on Mac OS X",
+ "previous_url": "/docs/configuring-odbc-on-mac-os-x/",
"relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md",
"title": "Configuring ODBC on Windows",
"url": "/docs/configuring-odbc-on-windows/"
@@ -9503,7 +9566,7 @@
"parent": "Installing Drill in Distributed Mode",
"previous_title": "Installing Drill on the Cluster",
"previous_url": "/docs/installing-drill-on-the-cluster/",
- "relative_path": "_docs/install/050-starting-drill-in-distributed mode.md",
+ "relative_path": "_docs/install/050-starting-drill-in-distributed-mode.md",
"title": "Starting Drill in Distributed Mode",
"url": "/docs/starting-drill-in-distributed-mode/"
},
@@ -11314,7 +11377,7 @@
"parent": "Installing Drill in Distributed Mode",
"previous_title": "Installing Drill on the Cluster",
"previous_url": "/docs/installing-drill-on-the-cluster/",
- "relative_path": "_docs/install/050-starting-drill-in-distributed mode.md",
+ "relative_path": "_docs/install/050-starting-drill-in-distributed-mode.md",
"title": "Starting Drill in Distributed Mode",
"url": "/docs/starting-drill-in-distributed-mode/"
}
@@ -12020,8 +12083,8 @@
}
],
"children": [],
- "next_title": "Configuring ODBC on Linux/Mac OS X",
- "next_url": "/docs/configuring-odbc-on-linux-mac-os-x/",
+ "next_title": "Configuring ODBC on Linux",
+ "next_url": "/docs/configuring-odbc-on-linux/",
"parent": "Configuring ODBC",
"previous_title": "Configuring ODBC",
"previous_url": "/docs/configuring-odbc/",
@@ -12041,14 +12104,35 @@
}
],
"children": [],
- "next_title": "Configuring ODBC on Windows",
- "next_url": "/docs/configuring-odbc-on-windows/",
+ "next_title": "Configuring ODBC on Mac OS X",
+ "next_url": "/docs/configuring-odbc-on-mac-os-x/",
"parent": "Configuring ODBC",
"previous_title": "ODBC Configuration Reference",
"previous_url": "/docs/odbc-configuration-reference/",
- "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md",
- "title": "Configuring ODBC on Linux/Mac OS X",
- "url": "/docs/configuring-odbc-on-linux-mac-os-x/"
+ "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md",
+ "title": "Configuring ODBC on Linux",
+ "url": "/docs/configuring-odbc-on-linux/"
+ },
+ {
+ "breadcrumbs": [
+ {
+ "title": "Configuring ODBC",
+ "url": "/docs/configuring-odbc/"
+ },
+ {
+ "title": "ODBC/JDBC Interfaces",
+ "url": "/docs/odbc-jdbc-interfaces/"
+ }
+ ],
+ "children": [],
+ "next_title": "Configuring ODBC on Windows",
+ "next_url": "/docs/configuring-odbc-on-windows/",
+ "parent": "Configuring ODBC",
+ "previous_title": "Configuring ODBC on Linux",
+ "previous_url": "/docs/configuring-odbc-on-linux/",
+ "relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md",
+ "title": "Configuring ODBC on Mac OS X",
+ "url": "/docs/configuring-odbc-on-mac-os-x/"
},
{
"breadcrumbs": [
@@ -12065,8 +12149,8 @@
"next_title": "Testing the ODBC Connection",
"next_url": "/docs/testing-the-odbc-connection/",
"parent": "Configuring ODBC",
- "previous_title": "Configuring ODBC on Linux/Mac OS X",
- "previous_url": "/docs/configuring-odbc-on-linux-mac-os-x/",
+ "previous_title": "Configuring ODBC on Mac OS X",
+ "previous_url": "/docs/configuring-odbc-on-mac-os-x/",
"relative_path": "_docs/odbc-jdbc-interfaces/configuring-odbc/030-configuring-odbc-on-windows.md",
"title": "Configuring ODBC on Windows",
"url": "/docs/configuring-odbc-on-windows/"
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_docs/install/050-starting-drill-in-distributed mode.md
----------------------------------------------------------------------
diff --git a/_docs/install/050-starting-drill-in-distributed mode.md b/_docs/install/050-starting-drill-in-distributed mode.md
deleted file mode 100644
index aca25eb..0000000
--- a/_docs/install/050-starting-drill-in-distributed mode.md
+++ /dev/null
@@ -1,87 +0,0 @@
----
-title: Starting Drill in Distributed Mode
-parent: "Installing Drill in Distributed Mode"
----
-
-The Drillbit service accepts requests from the client, processing the queries, and returning results to the client. You install Drill as a service and run the Drillbit on all of the required nodes in a Hadoop cluster to form a distributed cluster environment. When a Drillbit runs on each data node in the cluster, Drill maximizes data locality during query execution. Movement of data over the network or between nodes is minimized or eliminated when possible.
-
-To use Drill in distributed mode, you need to control a Drillbit. If you use Drill in embedded mode, you do not use the **drillbit** command.
-
-Using the **drillbit command**, located in the `bin` directory, you check the status of the Drillbit, start, stop, and restart a DrillBit. You can use a configuration file to start Drill. Using such a file is handy for controlling Drillbits on multiple nodes.
-
-### drillbit Command Syntax
-
- drillbit.sh [--config <conf-dir>] (start|stop|status|restart|autorestart)
-
-For example, to restart a Drillbit, navigate to the Drill installation directory, and issue the following command:
-
- bin/drillbit.sh restart
-
-## Starting the Drill Shell
-Using the Drill shell, you can connect to relational databases and execute SQL commands. To start the Drill shell, run one of the following scripts, which are located in the bin directory of the Drill installation:
-
-* `drill-conf`
- Opens the shell using the connection string to ZooKeeper nodes specified in the drill-conf script.
-* `drill-localhost`
- Opens the Drill shell using a connection to the ZooKeeper running on the local host.
-
-Complete the following steps to start the Drill shell on the local node:
-
- 1. Navigate to the Drill installation directory, and issue the following command to start the Drillbit if necessary:
-
- bin/drillbit.sh restart
- 2. Issue the following command to start the Drill shell if ZooKeeper is running on the same node as the shell:
-
- bin/drill-localhost
-
- Alternatively, issue the following command to start the Drill shell using the connection string in `drill-conf`:
-
- bin/drill-conf
-
- 3. Issue the following query to check the Drillbits running in the cluster:
-
- 0: jdbc:drill:zk=<zk1host>:<port> select * from sys.drillbits;
-
-Drill provides a list of Drillbits that are running.
-
- +----------------+---------------+---------------+---------------+-----------+
- | hostname | user_port | control_port | data_port | current |
- +----------------+---------------+---------------+---------------+-----------+
- | <host address> | <port number> | <port number> | <port number> | <boolean> |
- +----------------+---------------+---------------+---------------+-----------+
-
-Now you can run queries. The Drill installation includes sample data
-that you can query. Refer to [Querying Parquet Files]({{ site.baseurl }}/docs/querying-parquet-files/).
-
-### Using an Ad-Hoc Connection to Drill
-To use a custom connection to Drill, but not alter the connection string in `drill-conf` that you normally use, start the Drill shell on an ad-hoc basis using `sqlline`. For example, to start the Drill shell using a particular storage plugin as a schema, use the following command syntax:
-
- sqlline –u jdbc:drill:[schema=<storage plugin>;]zk=<zk name>[:<port>][,<zk name2>[:<port>]... ]
-
-#### sqlline Arguments
-
-* `-u` is the option that precedes a connection string. Required.
-* `jdbc` is the connection protocol. Required.
-* `schema` is the name of a [storage plugin]({{site.baseurl}}/docs/storage-plugin-registration) to use for queries. Optional.
-* `Zk=zkname` is one or more ZooKeeper host names or IP addresses.
-* `port` is the ZooKeeper port number. Optional. Port 2181 is the default.
-
-For example, start the Drill shell using the `dfs` storage plugin. Specifying the storage plugin when you start up eliminates the need to specify the storage plugin in the query:
-
- bin/sqlline –u jdbc:drill:schema=dfs;zk=centos26
-
-This command starts the Drill shell in a cluster configured to run ZooKeeper on three nodes:
-
- bin/sqlline –u jdbc:drill:zk=cento23,zk=centos24,zk=centos26:5181
-
-## Exiting the Drill Shell
-
-To exit the Drill shell, issue the following command:
-
- !quit
-
-## Stopping Drill
-
-In some cases, such as stopping while a query is in progress, the `!quit` command does not stop Drill running in embedded mode. In distributed mode, you stop the Drillbit service. Navigate to the Drill installation directory, and issue the following command to stop a Drillbit:
-
- bin/drillbit.sh stop
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_docs/install/050-starting-drill-in-distributed-mode.md
----------------------------------------------------------------------
diff --git a/_docs/install/050-starting-drill-in-distributed-mode.md b/_docs/install/050-starting-drill-in-distributed-mode.md
new file mode 100644
index 0000000..9ef5d0b
--- /dev/null
+++ b/_docs/install/050-starting-drill-in-distributed-mode.md
@@ -0,0 +1,87 @@
+---
+title: Starting Drill in Distributed Mode
+parent: "Installing Drill in Distributed Mode"
+---
+
+The Drillbit service accepts requests from the client, processing the queries, and returning results to the client. You install Drill as a service and run the Drillbit on all of the required nodes in a Hadoop cluster to form a distributed cluster environment. When a Drillbit runs on each data node in the cluster, Drill maximizes data locality during query execution. Movement of data over the network or between nodes is minimized or eliminated when possible.
+
+To use Drill in distributed mode, you need to control a Drillbit. If you use Drill in embedded mode, you do not use the **drillbit** command.
+
+Using the **drillbit command**, located in the `bin` directory, you check the status of the Drillbit, start, stop, and restart a DrillBit. You can use a configuration file to start Drill. Using such a file is handy for controlling Drillbits on multiple nodes.
+
+### drillbit Command Syntax
+
+ drillbit.sh [--config <conf-dir>] (start|stop|status|restart|autorestart)
+
+For example, to restart a Drillbit, navigate to the Drill installation directory, and issue the following command:
+
+ bin/drillbit.sh restart
+
+## Starting the Drill Shell
+Using the Drill shell, you can connect to relational databases and execute SQL commands. To start the Drill shell, run one of the following scripts, which are located in the bin directory of the Drill installation:
+
+* `drill-conf`
+ Opens the shell using the connection string to ZooKeeper nodes specified in `drill-override.conf` in `/opt/mapr/drill/drill-1.0.0/conf`.
+* `drill-localhost`
+ Opens the Drill shell using a connection to the ZooKeeper running on the local host.
+
+Complete the following steps to start the Drill shell on the local node:
+
+ 1. Navigate to the Drill installation directory, and issue the following command to start the Drillbit if necessary:
+
+ bin/drillbit.sh restart
+ 2. Issue the following command to start the Drill shell if ZooKeeper is running on the same node as the shell:
+
+ bin/drill-localhost
+
+ Alternatively, issue the following command to start the Drill shell using the connection string in `drill-conf`:
+
+ bin/drill-conf
+
+ 3. Issue the following query to check the Drillbits running in the cluster:
+
+ 0: jdbc:drill:zk=<zk1host>:<port> select * from sys.drillbits;
+
+Drill provides a list of Drillbits that are running.
+
+ +----------------+---------------+---------------+---------------+-----------+
+ | hostname | user_port | control_port | data_port | current |
+ +----------------+---------------+---------------+---------------+-----------+
+ | <host address> | <port number> | <port number> | <port number> | <boolean> |
+ +----------------+---------------+---------------+---------------+-----------+
+
+Now you can run queries. The Drill installation includes sample data
+that you can query. Refer to [Querying Parquet Files]({{ site.baseurl }}/docs/querying-parquet-files/).
+
+### Using an Ad-Hoc Connection to Drill
+To use a custom connection to Drill, but not alter the connection string in `drill-conf` that you normally use, start the Drill shell on an ad-hoc basis using `sqlline`. For example, to start the Drill shell using a particular storage plugin as a schema, use the following command syntax:
+
+ sqlline –u jdbc:drill:[schema=<storage plugin>;]zk=<zk name>[:<port>][,<zk name2>[:<port>]... ]
+
+#### sqlline Arguments
+
+* `-u` is the option that precedes a connection string. Required.
+* `jdbc` is the connection protocol. Required.
+* `schema` is the name of a [storage plugin]({{site.baseurl}}/docs/storage-plugin-registration) to use for queries. Optional.
+* `Zk=zkname` is one or more ZooKeeper host names or IP addresses.
+* `port` is the ZooKeeper port number. Optional. Port 2181 is the default.
+
+For example, start the Drill shell using the `dfs` storage plugin. Specifying the storage plugin when you start up eliminates the need to specify the storage plugin in the query:
+
+ bin/sqlline –u jdbc:drill:schema=dfs;zk=centos26
+
+This command starts the Drill shell in a cluster configured to run ZooKeeper on three nodes:
+
+ bin/sqlline –u jdbc:drill:zk=cento23,zk=centos24,zk=centos26:5181
+
+## Exiting the Drill Shell
+
+To exit the Drill shell, issue the following command:
+
+ !quit
+
+## Stopping Drill
+
+In some cases, such as stopping while a query is in progress, the `!quit` command does not stop Drill running in embedded mode. In distributed mode, you stop the Drillbit service. Navigate to the Drill installation directory, and issue the following command to stop a Drillbit:
+
+ bin/drillbit.sh stop
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md b/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
index 2fafa26..2ea6b4d 100644
--- a/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
+++ b/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
@@ -7,17 +7,14 @@ You can connect to Apache Drill through the following interfaces:
* Drill shell
* Drill Web UI
* [ODBC]({{ site.baseurl }}/docs/installing-the-odbc-driver/)*
- * [JDBC]({{ site.baseurl }}/docs/using-jdbc/)
+ * [JDBC]({{ site.baseurl }}/docs/using-jdbc-with-squirrel-on-windows/)
* C++ API
*Apache Drill does not have an open source ODBC driver. However, MapR provides an ODBC 3.8 driver developed specifically for connecting Apache Drill to BI tools.
## Using ODBC to Access Apache Drill from BI Tools
-MapR provides an ODBC 3.8 driver that connects Windows, Mac OS X, and Linux to Apache Drill and BI tools. Install the latest version of Apache Drill with the latest version of
-the MapR Drill ODBC driver. For example, if you have Apache Drill 0.8 and a MapR Drill ODBC driver installed on your machine, and you upgrade to Apache Drill 1.0, do not assume that the
-MapR Drill ODBC driver installed on your machine will work with the new version of
-Apache Drill. Use latest MapR Drill ODBC driver and Apache Drill versions.
+MapR provides an ODBC 3.8 driver that connects Windows, Mac OS X, and Linux to Apache Drill and BI tools. Install the latest version of Apache Drill with the latest version of the MapR Drill ODBC driver. An ODBC driver that you installed with a older version of Drill probably will not work with an upgraded version of Drill.
Access the latest MapR Drill ODBC drivers in the following location:
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_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
deleted file mode 100644
index f8c122d..0000000
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux-mac-os-x.md
+++ /dev/null
@@ -1,180 +0,0 @@
----
-title: "Configuring ODBC on Linux/Mac OS X"
-parent: "Configuring ODBC"
----
-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 (Linux only)
-* Step 2: Define the ODBC Data Sources in odbc.ini
-* Step 3: (Optional) Define the ODBC Driver in odbcinst.ini
-* Step 4: Configure the MapR Drill ODBC Driver
-
-## Sample Configuration Files
-
-Before you connect to Drill through an ODBC client tool
-on Linux or Mac OS X, copy the following configuration files in `/opt/mapr/drillobdc/Setup` to your home directory unless the files already exist in your home directory:
-
-* `mapr.drillodbc.ini`
-* `odbc.ini`
-* `odbcinst.ini`
-
-In your home directory, rename the files as hidden files. Use sudo if necessary:
-
-* .mapr.drillodbc.ini
-* .odbc.ini
-* .odbcinst.ini
-
-The installer for Mac OS X creates a sample user DSN in odbc.ini in either of the following locations:
-
-* ~/Library/ODBC/odbc.ini
-* ~/.odbc.ini
-
-Depending on the driver manager you use, the user DSN in one of these files will be effective.
-
-----------
-
-## Step 1: Set Environment Variables
-
-### Linux
-
-1. Set the ODBCINI environment variable to point to the `.odbc.ini` in your home directory. For example:
- `export ODBCINI=~/.odbc.ini`
-2. Set the MAPRDRILLINI environment variable to point to `.mapr.drillodbc.ini` in your home directory. For example:
- `export MAPRDRILLINI=~/.mapr.drillodbc.ini`
-3. Set the LD_LIBRARY_PATH environment variable to point to your ODBC driver manager libraries and the MapR ODBC Driver for Apache Drill shared libraries. For example:
- `export LD_LIBRARY_PATH=/usr/local/lib:/opt/mapr/drillodbc/lib/64`
-
-You can have both 32- and 64-bit versions of the driver installed at the same time on the same computer.
-{% include startimportant.html %}Do not include the paths to both 32- and 64-bit shared libraries in LD_LIBRARY PATH at the same time.{% include endimportant.html %}
-Only include the path to the shared libraries corresponding to the driver matching the bitness of the client application used.
-
-### Mac OS X
-
-Create or modify the `/etc/launchd.conf` file to set environment variables. Set the SIMBAINI variable to point to the `.mapr.drillodbc.ini` file, the ODBCSYSINI varialbe to the `.odbcinst.ini` file, the ODBCINI variable to the `.odbc.ini` file, and the DYLD_LIBRARY_PATH to the location of the dynamic linker (DYLD) libraries and to the MapR Drill ODBC Driver. If you installed the iODBC driver manager using the DMG, the DYLD libraries are installed in `/usr/local/iODBC/lib`. The launchd.conf file should look something like this:
-
- setenv SIMBAINI /Users/joeuser/.mapr.drillodbc.ini
- setenv ODBCSYSINI /Users/joeuser/.odbcinst.ini
- setenv ODBCINI /Users/joeuser/.odbc.ini
- 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
-
-Define the ODBC data sources in the `~/.odbc.ini` configuration file for your environment. The following sample shows a possible configuration for using Drill in embedded mode.
-
-**Example**
-
- [ODBC]
- # Specify any global ODBC configuration here such as ODBC tracing.
-
- [ODBC Data Sources]
- Sample MapR Drill DSN=MapR Drill ODBC Driver
-
- [Sample MapR Drill DSN]
- # Description: DSN Description.
- # This key is not necessary and is only to give a description of the data source.
- Description=Sample MapR Drill ODBC Driver DSN
- # 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 on the connection string.
- # AuthenticationType: No authentication; Basic Authentication
- ConnectionType=Direct
- HOST=localhost
- PORT=31010
- 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=
-
-### 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`
-
-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
-behavior of DSNs using the MapR Drill ODBC Driver.
-
-----------
-
-## Step 3: (Optional) Define the ODBC Driver in .odbcinst.ini
-
-The `.odbcinst.ini` is an optional configuration file that defines the ODBC
-Drivers. This configuration file is optional because you can specify drivers
-directly in the` .odbc.ini` configuration file. The following sample shows a possible configuration.
-
-**Example**
-
- [ODBC Drivers]
- MapR Drill ODBC Driver=Installed
-
- [MapR Drill ODBC Driver]
- Description=MapR Drill ODBC Driver
- Driver=/opt/mapr/drillodbc/lib/universal/libmaprdrillodbc.dylib
-
-----------
-
-## Step 4: Configure the MapR Drill ODBC Driver
-
-Configure the MapR Drill ODBC Driver for your environment by modifying the `.mapr.drillodbc.ini` configuration
-file. This configures the driver to work with your ODBC driver manager. The following sample shows a possible configuration, which you can use as is if you installed the default iODBC driver manager.
-
-**Example**
-
- [Driver]
- ## - Note that this default DriverManagerEncoding of UTF-32 is for iODBC.
- DriverManagerEncoding=UTF-32
- ErrorMessagesPath=/opt/mapr/drillodbc/ErrorMessages
-
- LogLevel=0
- LogPath=
- SwapFilePath=/tmp
-
- # iODBC
- ODBCInstLib=libiodbcinst.dylib
-
-### Configuring .mapr.drillodbc.ini
-
-To configure the MapR Drill ODBC Driver in the `mapr.drillodbc.ini` configuration file, complete the following steps:
-
- 1. Open the `mapr.drillodbc.ini` configuration file in a text editor.
- 2. Edit the DriverManagerEncoding setting if necessary. The value is typically UTF-16 or UTF-32, but depends on the driver manager used. iODBC uses UTF-32 and unixODBC uses UTF-16. Review your ODBC Driver Manager documentation for the correct setting.
- 3. Edit the `ODBCInstLib` setting. The value is the name of the `ODBCInst` shared library for the ODBC driver manager that you use. The configuration file defaults to the shared library for `iODBC`. In Linux, the shared library name for iODBC is `libiodbcinst.so`. In Mac OS X, the shared library name for `iODBC` is `libiodbcinst.dylib`.
- {% include startnote.html %}Review your ODBC Driver Manager documentation for the correct
-setting.{% include endnote.html %}
- Specify an absolute or relative filename for the library. If you use
-the relative file name, include the path to the library in the library path
-environment variable. In Linux, the library path environment variable is named
-`LD_LIBRARY_PATH`. In Mac OS X, the library path environment variable is
-named `DYLD_LIBRARY_PATH`.
- 4. Save the `mapr.drillodbc.ini` configuration file.
-
-### Next Step
-
-Refer to [Testing the ODBC Connection on Linux and Mac OS X]({{ site.baseurl }}/docs/testing-the-odbc-connection).
-
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md
new file mode 100644
index 0000000..ad83541
--- /dev/null
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/020-configuring-odbc-on-linux.md
@@ -0,0 +1,192 @@
+---
+title: "Configuring ODBC on Linux"
+parent: "Configuring ODBC"
+---
+ODBC driver managers use configuration files to define and configure ODBC data
+sources and drivers. To configure an ODBC connection for Linux, complete the following
+steps:
+
+* [Step 1: Set Environment Variables]({{site.baseurl}}/docs/configuring-odbc-on-linux/#step-1:-set-environment-variables)
+* [Step 2: Define the ODBC Data Sources in odbc.ini]({{site.baseurl}}/docs/configuring-odbc-on-linux/#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-linux/#step-3:-(optional)-define-the-odbc-driver-in-.odbcinst.ini)
+* [Step 4: Configure the MapR Drill ODBC Driver]({{site.baseurl}}/docs/configuring-odbc-on-linux/#configuring-.mapr.drillodbc.ini)
+
+## Sample Configuration Files
+
+Before you connect to Drill through an ODBC client tool
+on Linux, copy the following configuration files in `/opt/mapr/drillobdc/Setup` to your home directory unless the files already exist in your home directory:
+
+* `mapr.drillodbc.ini`
+* `odbc.ini`
+* `odbcinst.ini`
+
+In your home directory, rename the files as hidden files. Use sudo if necessary:
+
+* .mapr.drillodbc.ini
+* .odbc.ini
+* .odbcinst.ini
+
+----------
+
+## Step 1: Set Environment Variables
+
+1. Set the ODBCINI environment variable to point to the `.odbc.ini` in your home directory. For example:
+ `export ODBCINI=~/.odbc.ini`
+2. Set the MAPRDRILLINI environment variable to point to `.mapr.drillodbc.ini` in your home directory. For example:
+ `export MAPRDRILLINI=~/.mapr.drillodbc.ini`
+3. Set the LD_LIBRARY_PATH environment variable to point to your ODBC driver manager libraries and the MapR ODBC Driver for Apache Drill shared libraries. For example:
+ `export LD_LIBRARY_PATH=/usr/local/lib:/opt/mapr/drillodbc/lib/64`
+
+You can have both 32- and 64-bit versions of the driver installed at the same time on the same computer.
+{% include startimportant.html %}Do not include the paths to both 32- and 64-bit shared libraries in LD_LIBRARY PATH at the same time.{% include endimportant.html %}
+Only include the path to the shared libraries corresponding to the driver matching the bitness of the client application you use to access Drill.
+
+----------
+
+## Step 2: Define the ODBC Data Sources in .odbc.ini
+
+Define the ODBC data sources in the `~/.odbc.ini` configuration file for your environment. You set the following properties for using Drill in embedded mode:
+
+ ConnectionType=Direct
+ HOST=localhost
+ PORT=31010
+ ZKQuorum=
+ ZKClusterID=
+
+You set the following properties for using Drill in distributed mode:
+
+ ConnectionType=ZooKeeper
+ HOST=
+ PORT=
+ ZKQuorum=<host name>:<port>,<host name>:<port> . . . <host name>:<port>
+ ZKClusterID=<cluster name in `drill-override.conf`>
+
+The following Linux sample shows a possible configuration for using Drill in distributed mode. The configuration assumes you started Drill using the `drill-conf` command. The example modifies the default Linux-installed `.odbc.ini` for a 64-bit system by commenting out 32-bit properties, adding 64-bit properties, and removes the extraneous [Sample MapR Drill DSN 64] from `.odbc.ini`.
+
+ [ODBC]
+ Trace=no
+
+ [ODBC Data Sources]
+ #Sample MapR Drill DSN 32=MapR Drill ODBC Driver 32-bit
+ Sample MapR Drill DSN 64=MapR Drill ODBC Driver 64-bit
+
+ [Sample MapR Drill DSN 64]
+ #[Sample MapR Drill DSN 32]
+ # This key is not necessary and only describes the data source.
+ #Description=MapR Drill ODBC Driver (32-bit) DSN
+ Description=MapR Drill ODBC Driver (64-bit) DSN
+
+
+ # Driver: The location where the ODBC driver is installed to.
+ #Driver=/opt/mapr/drillodbc/lib/32/libmaprdrillodbc32.so
+ Driver=/opt/mapr/drillodbc/lib/64/libmaprdrillodbc64.so
+
+ # 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 on the connection string.
+ # AuthenticationType: No authentication; Basic Authentication
+ ConnectionType=ZooKeeper
+ HOST=
+ PORT=
+ ZKQuorum=centos23:5181,centos28:5181,centos29:5181
+ ZKClusterID=docs41cluster-drillbits
+ 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=
+
+ # The DriverUnicodeEncoding setting is only used for SimbaDM
+
+### Authentication Properties
+To password protect the DSN, uncomment the AuthenticationType, select Basic Authentication for the AuthenticationType, and configure UID and PWD properties.
+
+### Direct 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. Format ZKQuorum as a comma separated list of ZooKeeper nodes in the following format:
+`<host name/ip address> : <port number>, <host name/ip address> : <port number>, . . .`
+
+For example:
+
+* `ZKQuorum=centos23:5181,centos28:5181,centos29:5181`
+* `ZKClusterID=docs41cluster-drillbits`
+
+To use Drill in embedded mode, do not define the ZKQuorum and ZKClusterID properties. Start Drill using the drill-localhost command, set ConnectionType to Direct, and define HOST and PORT properties. For example:
+
+* `HOST=centos32.lab:5181`
+* `PORT=31010`
+
+[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.
+
+----------
+
+## Step 3: (Optional) Define the ODBC Driver in .odbcinst.ini
+
+The `.odbcinst.ini` is an optional configuration file that defines the ODBC
+Drivers. This configuration file is optional because you can specify drivers
+directly in the` .odbc.ini` configuration file. The `.odbinst.ini` file contains the following sample configurations.
+
+**Example**
+
+ [ODBC Drivers]
+ [ODBC Drivers]
+ MapR Drill ODBC Driver 32-bit=Installed
+ MapR Drill ODBC Driver 64-bit=Installed
+
+ [MapR Drill ODBC Driver 32-bit]
+ Description=MapR Drill ODBC Driver(32-bit)
+ Driver=/opt/mapr/drillodbc/lib/32/libmaprdrillodbc32.so
+
+ [MapR Drill ODBC Driver 64-bit]
+ Description=MapR Drill ODBC Driver(64-bit)
+ Driver=/opt/mapr/drillodbc/lib/64/libmaprdrillodbc64.so
+
+----------
+
+## Step 4: Configure the MapR Drill ODBC Driver
+
+Configure the MapR Drill ODBC Driver for your environment by modifying the `.mapr.drillodbc.ini` configuration
+file. This configures the driver to work with your ODBC driver manager. The following sample shows a possible configuration, which you can use as is if you installed the default iODBC driver manager.
+
+**Example**
+
+ . . .
+ [Driver]
+ DriverManagerEncoding=UTF-32
+ ErrorMessagesPath=/opt/mapr/drillodbc/ErrorMessages
+ LogLevel=0
+ LogPath=[LogPath]
+ SwapFilePath=/tmp
+
+ ## - Uncomment the ODBCInstLib corresponding to the Driver Manager being used.
+ ## - Note that the path to your ODBC Driver Manager must be specified in LD_LIBRARY_PATH.
+
+ # Generic ODBCInstLib
+ # iODBC
+ ODBCInstLib=libiodbcinst.so
+ . . .
+
+### Configuring .mapr.drillodbc.ini
+
+To configure the MapR Drill ODBC Driver in the `mapr.drillodbc.ini` configuration file, complete the following steps:
+
+ 1. Open the `mapr.drillodbc.ini` configuration file in a text editor.
+ 2. Edit the DriverManagerEncoding setting if necessary. The value is typically UTF-16 or UTF-32, but depends on the driver manager used. iODBC uses UTF-32 and unixODBC uses UTF-16. Review your ODBC Driver Manager documentation for the correct setting.
+ 3. Edit the `ODBCInstLib` setting. The value is the name of the `ODBCInst` shared library for the ODBC driver manager that you use. The configuration file defaults to the shared library for `iODBC`. In Linux, the shared library name for iODBC is `libiodbcinst.so`.
+
+ Specify an absolute or relative filename for the library. If you use
+the relative file name, include the path to the library in the library path
+environment variable. The library path environment variable is named
+`LD_LIBRARY_PATH`.
+ 4. Save the `mapr.drillodbc.ini` configuration file.
+
+### Next Step
+
+Refer to [Testing the ODBC Connection]({{ site.baseurl }}/docs/testing-the-odbc-connection).
+
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_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
new file mode 100644
index 0000000..a93b31c
--- /dev/null
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/025-configuring-odbc-on-mac-os-x.md
@@ -0,0 +1,183 @@
+---
+title: "Configuring ODBC on Mac OS X"
+parent: "Configuring ODBC"
+---
+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 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)
+
+## Sample Configuration Files
+
+Before you connect to Drill through an ODBC client tool
+on Mac OS X, copy the following configuration files in `/opt/mapr/drillobdc/Setup` to your home directory unless the files already exist in your home directory:
+
+* `mapr.drillodbc.ini`
+* `odbc.ini`
+* `odbcinst.ini`
+
+In your home directory, rename the files as hidden files. Use sudo if necessary:
+
+* .mapr.drillodbc.ini
+* .odbc.ini
+* .odbcinst.ini
+
+The installer for Mac OS X creates a sample user DSN in odbc.ini in either of the following locations:
+
+* ~/Library/ODBC/odbc.ini
+* ~/.odbc.ini
+
+Depending on the driver manager you use, the user DSN in one of these files will be effective.
+
+----------
+
+## Step 1: Set Environment Variables
+
+Create or modify the `/etc/launchd.conf` file to set environment variables. Set the SIMBAINI variable to point to the `.mapr.drillodbc.ini` file, the ODBCSYSINI varialbe to the `.odbcinst.ini` file, the ODBCINI variable to the `.odbc.ini` file, and the DYLD_LIBRARY_PATH to the location of the dynamic linker (DYLD) libraries and to the MapR Drill ODBC Driver. If you installed the iODBC driver manager using the DMG, the DYLD libraries are installed in `/usr/local/iODBC/lib`. The launchd.conf file should look something like this:
+
+ setenv SIMBAINI /Users/joeuser/.mapr.drillodbc.ini
+ setenv ODBCSYSINI /Users/joeuser/.odbcinst.ini
+ setenv ODBCINI /Users/joeuser/.odbc.ini
+ 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
+
+Define the ODBC data sources in the `~/.odbc.ini` configuration file for your environment.
+
+You set the following properties for using Drill in embedded mode:
+
+ ConnectionType=Direct
+ HOST=localhost
+ PORT=31010
+ ZKQuorum=
+ ZKClusterID=
+
+You set the following properties for using Drill in distributed mode:
+
+ ConnectionType=ZooKeeper
+ HOST=
+ PORT=
+ ZKQuorum=<host name>:<port>,<host name>:<port> . . . <host name>:<port>
+ ZKClusterID=<cluster name in `drill-override.conf`>
+
+The following sample shows a possible configuration for using Drill in embedded mode.
+
+ [ODBC]
+ # Specify any global ODBC configuration here such as ODBC tracing.
+
+ [ODBC Data Sources]
+ Sample MapR Drill DSN=MapR Drill ODBC Driver
+
+ [Sample MapR Drill DSN]
+ # Description: DSN Description.
+ # This key is not necessary and only describes the data source.
+ Description=Sample MapR Drill ODBC Driver DSN
+ # Driver: The location where the ODBC driver is installed.
+ 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 on the connection string.
+ # AuthenticationType: No authentication; Basic Authentication
+ ConnectionType=Direct
+ HOST=localhost
+ PORT=31010
+ 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=
+
+
+### Authentication Properties
+To password protect the DSN, uncomment the AuthenticationType, select Basic Authentication for the AuthenticationType, and configure UID and PWD properties.
+
+### Direct 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. Format ZKQuorum as a comma separated list of ZooKeeper nodes in the following format:
+`<host name/ip address> : <port number>, <host name/ip address> : <port number>, . . .`
+
+For example:
+
+* `ZKQuorum=centos23:5181,centos28:5181,centos29:5181`
+* `ZKClusterID=docs41cluster-drillbits`
+
+To use Drill in local mode, do not define the ZKQuorum and ZKClusterID properties. Start Drill using the drill-localhost command, set ConnectionType to Direct, and define HOST and PORT properties. For example:
+
+* `HOST=centos32.lab:5181`
+* `PORT=31010`
+
+[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.
+
+----------
+
+## Step 3: (Optional) Define the ODBC Driver in .odbcinst.ini
+
+The `.odbcinst.ini` is an optional configuration file that defines the ODBC
+Drivers. This configuration file is optional because you can specify drivers
+directly in the` .odbc.ini` configuration file. The following sample shows a possible configuration.
+
+**Example**
+
+ [ODBC Drivers]
+ MapR Drill ODBC Driver=Installed
+
+ [MapR Drill ODBC Driver]
+ Description=MapR Drill ODBC Driver
+ Driver=/opt/mapr/drillodbc/lib/universal/libmaprdrillodbc.dylib
+
+----------
+
+## Step 4: Configure the MapR Drill ODBC Driver
+
+Configure the MapR Drill ODBC Driver for your environment by modifying the `.mapr.drillodbc.ini` configuration
+file. This configures the driver to work with your ODBC driver manager. The following sample shows a possible configuration, which you can use as is if you installed the default iODBC driver manager.
+
+**Example**
+
+ [Driver]
+ ## - Note that this default DriverManagerEncoding of UTF-32 is for iODBC.
+ DriverManagerEncoding=UTF-32
+ ErrorMessagesPath=/opt/mapr/drillodbc/ErrorMessages
+
+ LogLevel=0
+ LogPath=
+ SwapFilePath=/tmp
+
+ # iODBC
+ ODBCInstLib=libiodbcinst.dylib
+
+### Configuring .mapr.drillodbc.ini
+
+To configure the MapR Drill ODBC Driver in the `mapr.drillodbc.ini` configuration file, complete the following steps:
+
+ 1. Open the `mapr.drillodbc.ini` configuration file in a text editor.
+ 2. Edit the DriverManagerEncoding setting if necessary. The value is typically UTF-16 or UTF-32, but depends on the driver manager used. iODBC uses UTF-32 and unixODBC uses UTF-16. Review your ODBC Driver Manager documentation for the correct setting.
+ 3. Edit the `ODBCInstLib` setting. The value is the name of the `ODBCInst` shared library for the ODBC driver manager that you use. The configuration file defaults to the shared library for `iODBC`. The shared library name for `iODBC` is `libiodbcinst.dylib`.
+
+ Specify an absolute or relative filename for the library. If you use
+the relative file name, include the path to the library in the library path
+environment variable. The library path environment variable is
+named `DYLD_LIBRARY_PATH`.
+ 4. Save the `mapr.drillodbc.ini` configuration file.
+
+### Next Step
+
+Refer to [Testing the ODBC Connection]({{ site.baseurl }}/docs/testing-the-odbc-connection).
+
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_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 d241b27..16dc102 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
@@ -37,21 +37,22 @@ In the Connection Type section, Direct to Drillbit is selected for using Drill i
* `HOST=localhost`
* `PORT=31010`
-Check the `drill-override.conf` file for any port changes.
+Check the `drill-override.conf` file for any port changes.
-To use Drill in distributed mode, select **ZooKeeper Quorum**.
-
+To use Drill in distributed mode, select ZooKeeper Quorum.
+
+If you select ZooKeeper Quorum, provide values for the following properties:
-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.
+* 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. Check the drill-override.conf file for ZooKeeper node information and for any cluster name changes.
-Check the `drill-override.conf` file for ZooKeeper node information and for any cluster name changes.
+ 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].
+[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/).
### Next Step
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_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 28b1a7e..d23d801 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,9 +4,9 @@ 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](/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-mac-os-x)
-* [Testing the ODBC Connection on Linux](/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-linux)
-* [Testing the ODBC Connection on Windows](/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-windows)
+* [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 Windows]({{site.baseurl}}/docs/testing-the-odbc-connection/#testing-the-odbc-connection-on-windows)
## Testing the ODBC Connection on Mac OS X
@@ -26,8 +26,7 @@ To test the ODBC connection Mac OS X, follow these steps.
## Testing the ODBC Connection on Linux
-To test the ODBC connection on Linux use the test utilities that are packaged
-with your driver manager installation: `iodbctest` and `iodbctestw`. Use `iodbctest` to
+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
test how your driver works with an ANSI application. Use `iodbctestw` to test
how your driver works with a Unicode application.
@@ -36,24 +35,54 @@ There are 32-bit and 64-bit installations of the iODBC driver manager available.
Visit [http://www.iodbc.org](http://www.iodbc.org/) for further details on
using the iODBC driver manager.
-To test the ODBC connection on Linux, follow these steps:
+**Example**
-1. [Start Drill]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/).
-2. Run `iodbctest` or `iodbctestw`. The program prompts you for an ODBC connection string.
-2. If you do not remember the DSN name, type a question mark (?) to see a list of DSNs.
-3. If you are connecting directly to a Drillbit, type an ODBC connection string using the following format:
+To test the ODBC connection on a Linux cluster, follow these steps:
- `DRIVER=MapR Drill ODBC Driver;ConnectionType=Direct;Host=HostName;Port=PortNumber`
+1. [Start Drill]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/). For example, to start Drill in local mode on a linux cluster:
+ [root@centos23 drill-1.0.0]# bin/drill-localhost
+ apache drill 1.0.0
+ "the only truly happy people are children, the creative minority and drill users"
+
+2. Run `iodbctest` or `iodbctestw`.
+ The prompt for an ODBC connection string appears.
+ [root@centos23 libiodbc-3.52.7]# samples/iodbctest
+ iODBC Demonstration program
+ This program shows an interactive SQL processor
+ Driver Manager: 03.52.0709.0909
+
+ Enter ODBC connect string (? shows list): ?
+
+3. Type ? to see the DSN name.
+ Output is:
+
+ DSN | Driver
+ ------------------------------------------------------------------------------
+ Sample MapR Drill DSN 64 | MapR Drill ODBC Driver 64-bit
+ Enter ODBC connect string (? shows list):
+
+4. If you are connecting directly to a Drillbit, type an ODBC connection string using the following format:
+
+ `DSN=<DSN name>;ConnectionType=Direct;Host=<Host Name>;Port=<Port Number>`
OR
- If you are connecting to a ZooKeeper cluster, type an ODBC connection string
-using the following format:
+ If you are connecting to a ZooKeeper cluster, type an ODBC connection string using the following format:
+
+ `DSN=<DSN Name>;ConnectionType=ZooKeeper;ZKQuorum=<Server1:Port1>
+,<Server2:Port2>;ZKClusterID=<Cluster Name>`
+
+ The following example shows a connection string:
+
+ `DSN=Sample MapR Drill DSN 64;ConnectionType=Direct;Host=localhost;Port=31010`
+
+ The output of a successful test is:
+
+ `Driver: 1.0.0.1001 (MapR Drill ODBC Driver)
- `DRIVER=MapR Drill ODBC Driver;ConnectionType=ZooKeeper;ZKQuorum=Server1:Port1
-,Server2:Port2;ZKClusterID=DrillbitName`
+ SQL> `
- If the connection is successful, the `SQL>` prompt appears.
+ 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 Windows
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_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 32a6719..440fdeb 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 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:
+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:
* [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)
@@ -26,10 +26,10 @@ Verify that your system meets the system requirements before you start.
* An installed ODBC driver manager:
* iODBC 3.52.7 or above
OR
- * unixODBC 2.2.12 or above
+ * unixODBC 2.2.12 or above
On Linux, 3.52.7 is available as a tarball. After unpacking the tarball, see the README for instructions about building the driver manager.
- * 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 in `/etc/hosts` for the Drill node(s):
+ * The client must be able to resolve the actual host name of the Drill node or nodes from the IP address. Verify that a DNS entry was created on the client machine for the Drill node or nodes.
+If not, create an entry in `/etc/hosts` for each node in the following format:
`<drill-machine-IP> <drill-machine-hostname>`
Example: `127.0.0.1 localhost`
@@ -37,12 +37,14 @@ If not, create the following entry in `/etc/hosts` for the Drill node(s):
To install the driver, you need Administrator privileges on the computer.
## Step 1: Download the MapR Drill ODBC Driver
+Download either the 32- or 64-bit driver from the following sites:
* [MapR Drill ODBC Driver (32-bit)]
- wget 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
* [MapR Drill ODBC Driver (64-bit)]
- wget 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
## Step 2: Install the MapR Drill ODBC Driver
@@ -50,14 +52,10 @@ To install the driver, complete the following steps:
1. Login as the root user.
2. Navigate to the folder that contains the driver RPM packages to install.
- 3. Enter the following command where _RPMFileName_ is the file name of the RPM package containing the version of the driver that you want to install:
-
- **RedHat/CentOS**
-
+ 3. Enter the following command where _RPMFileName_ is the file name of the RPM package containing the version of the driver that you want to install:
+ * RedHat/CentOS
`yum localinstall --nogpgcheck <RPMFileName>`
-
- **SUSE**
-
+ * SUSE
`zypper install RPMFileName`
The MapR Drill ODBC Driver depends on the following resources:
@@ -92,5 +90,5 @@ or
### Next Step
-[Configuring ODBC on Linux and Mac OS X]({{ site.baseurl }}/docs/configuring-connections-on-linux-and-mac-os-x).
+[Configuring ODBC on Linux and Mac OS X]({{ site.baseurl }}/docs/configuring-odbc-on-linux-mac-os-x/).
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_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 144d848..80e6ada 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,11 +5,11 @@ parent: "Installing the ODBC Driver"
Install the MapR Drill ODBC Driver on the machine from which you connect to
the Drill service.
-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:
+Install the MapR Drill ODBC Driver on a system that meets the [system requirements]({{site.baseurl}}/docs/installing-the-driver-on-mac-os-x/#system-requirements). 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)
- * [Step 3: Check the MapR Drill ODBC Driver Version]({{site.baseurl}}docs/install-the-driver-on-mac-os-x/#step-3:-check-the-mapr-drill-odbc-driver-version)
+ * [Step 2: Install the MapR Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-mac-os-x/#step-2:-install-the-mapr-drill-odbc-driver)
+ * [Step 3: Check the MapR Drill ODBC Driver Version]({{site.baseurl}}docs/installing-the-driver-on-mac-os-x/#step-3:-check-the-mapr-drill-odbc-driver-version)
## System Requirements
@@ -17,9 +17,11 @@ To ensure success, install the MapR Drill ODBC Driver on a system that meets the
* 100 MB of available disk space
* iODBC 3.52.7 or later
The iodbc-config file in the `/usr/local/iODBC/bin` includes the version.
- * 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 necessary, create the following entry in `/etc/hosts` for the Drill node(s):
-`<drill-machine-IP> <drill-machine-hostname>`
-Example: `127.0.0.1 localhost`
+ * The client must be able to resolve the actual host name of the Drill node or nodes from the IP address. Verify that a DNS entry was created on the client machine for the Drill node or nodes.
+If not, create an entry in `/etc/hosts` for each node in the following format:
+
+ `<drill-machine-IP> <drill-machine-hostname>`
+ Example: `127.0.0.1 localhost`
To install the driver, you need Administrator privileges on the computer.
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_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 c2b97bd..e62147e 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
@@ -2,11 +2,11 @@
title: "Installing the Driver on Windows"
parent: "Installing the ODBC Driver"
---
-The MapR Drill ODBC Driver installer is available for 32-bit and 64-bit
+The MapR Drill ODBC Driver installer is available for 32- and 64-bit
applications on Windows. Both versions of the driver can be installed on a 64-bit
machine.
-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:
+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)
@@ -23,10 +23,11 @@ requirements:
* Windows® Server 2008, 2013 R2
* .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 an entry for the Drill node(s) in the HOSTS file:
-
+ * The client must be able to resolve the actual host name of the Drill node or nodes from the IP address. Verify that a DNS entry was created on the client machine for the Drill node or nodes.
+If not, create an entry in `/etc/hosts` for each node in the following format:
+
`<drill-machine-IP> <drill-machine-hostname>`
- Example: `127.0.1.1 apachedemo`
+ Example: `127.0.0.1 localhost`
To install the driver, you need Administrator privileges on the computer.
@@ -57,7 +58,7 @@ Download the installer that corresponds to the bitness of the client application
To verify the installation, perform the following steps:
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:
+ Installing the ODBC Administrator installs Drill Explorer and the Tableau TDC file. For example, on Windows 8.1 in Apps, several apps appear under MaprDrill ODBC Driver 1.0:
2. Click the ODBC Administrator app icon.
@@ -66,7 +67,7 @@ To verify the installation, perform the following steps:
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.
+You need to configure and start Drill before [testing]({{site.baseurl}}/docs/testing-the-odbc-connection/) the ODBC Data Source Administrator.
## The Tableau Data-connection Customization (TDC) File
http://git-wip-us.apache.org/repos/asf/drill/blob/3d023e2a/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md b/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
index 81475bf..6316d69 100644
--- a/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
+++ b/_docs/odbc-jdbc-interfaces/using-drill-explorer/020-connecting-drill-explorer-to-data.md
@@ -2,7 +2,11 @@
title: "Connecting Drill Explorer to Data"
parent: "Using Drill Explorer"
---
-The way you start Drill Explorer differs depending on your platform, but regardless of the platform, Drill must be running. On a single-node, embedded Drill cluster, [start the Drill shell]({{site.baseurl}}/docs/installing-drill-in-embedded-mode/). On a distributed Drill cluster, [start the Drillbit]({{site.baseurl}}/docs/starting-drill-in-distributed-mode/).
+The way you start Drill Explorer differs depending on your platform, but regardless of the platform, Drill must be running.
+
+## Connecting Drill Explorer to Data on Linux
+
+You need an X-11 XDisplay to use Drill Explorer on Linux. Run the DrillExplorer executable in `/opt/mapr/drillodbc/DrillExplorer`, and then follow instructions from step 2 in the next section, "Connecting Drill Explorer to Data on Mac OS X."
## Connecting Drill Explorer to Data on Mac OS X
[07/10] drill git commit: typo, minor edit
Posted by br...@apache.org.
typo, minor edit
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/5dc90cdd
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/5dc90cdd
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/5dc90cdd
Branch: refs/heads/gh-pages
Commit: 5dc90cdda77eef8b059a63c6eb0c384ff08707fc
Parents: 36d3a5c
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Jun 10 14:54:29 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Jun 10 14:54:29 2015 -0700
----------------------------------------------------------------------
.../010-sample--data-donuts.md | 54 ++++++++++----------
.../020-selecting-flat-data.md | 18 ++++---
2 files changed, 39 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/5dc90cdd/_docs/query-data/querying-complex-data/010-sample--data-donuts.md
----------------------------------------------------------------------
diff --git a/_docs/query-data/querying-complex-data/010-sample--data-donuts.md b/_docs/query-data/querying-complex-data/010-sample--data-donuts.md
index f1c7a1f..29e72f7 100644
--- a/_docs/query-data/querying-complex-data/010-sample--data-donuts.md
+++ b/_docs/query-data/querying-complex-data/010-sample--data-donuts.md
@@ -2,37 +2,39 @@
title: "Sample Data: Donuts"
parent: "Querying Complex Data"
---
-The complex data queries use the sample `donuts.json` file. To download this file, go to [Drill test resources](https://github.com/apache/drill/tree/master/exec/java-exec/src/test/resources) page, locate donuts.json in the list of files, and download it. For example, on the Mac right-click the five, select Save Link As, and then click Save.
+The complex data queries use the sample `donuts.json` file. To download this file, go to [Drill test resources](https://github.com/apache/drill/tree/master/exec/java-exec/src/test/resources) page, locate donuts.json in the list of files, and download it.
-Here is the single complete "record" (`0001`) from the `donuts.json `file. In
+Here is the first "record" (`0001`) from the `donuts.json `file. In
terms of Drill query processing, this record is equivalent to a single record
in a table.
{
- "id": "0001",
- "type": "donut",
- "name": "Cake",
- "ppu": 0.55,
- "batters":
- {
- "batter":
- [
- { "id": "1001", "type": "Regular" },
- { "id": "1002", "type": "Chocolate" },
- { "id": "1003", "type": "Blueberry" },
- { "id": "1004", "type": "Devil's Food" }
- ]
- },
- "topping":
- [
- { "id": "5001", "type": "None" },
- { "id": "5002", "type": "Glazed" },
- { "id": "5005", "type": "Sugar" },
- { "id": "5007", "type": "Powdered Sugar" },
- { "id": "5006", "type": "Chocolate with Sprinkles" },
- { "id": "5003", "type": "Chocolate" },
- { "id": "5004", "type": "Maple" }
- ]
+ "id": "0001",
+ "type": "donut",
+ "name": "Cake",
+ "ppu": 0.55,
+ "sales": 35,
+
+ "batters":
+ {
+ "batter":
+ [
+ { "id": "1001", "type": "Regular" },
+ { "id": "1002", "type": "Chocolate" },
+ { "id": "1003", "type": "Blueberry" },
+ { "id": "1004", "type": "Devil's Food" }
+ ]
+ },
+ "topping":
+ [
+ { "id": "5001", "type": "None" },
+ { "id": "5002", "type": "Glazed" },
+ { "id": "5005", "type": "Sugar" },
+ { "id": "5007", "type": "Powdered Sugar" },
+ { "id": "5006", "type": "Chocolate with Sprinkles" },
+ { "id": "5003", "type": "Chocolate" },
+ { "id": "5004", "type": "Maple" }
+ ]
}
The data is made up of maps, arrays, and nested arrays. Name-value pairs and
http://git-wip-us.apache.org/repos/asf/drill/blob/5dc90cdd/_docs/query-data/querying-complex-data/020-selecting-flat-data.md
----------------------------------------------------------------------
diff --git a/_docs/query-data/querying-complex-data/020-selecting-flat-data.md b/_docs/query-data/querying-complex-data/020-selecting-flat-data.md
index 1f11905..2910feb 100644
--- a/_docs/query-data/querying-complex-data/020-selecting-flat-data.md
+++ b/_docs/query-data/querying-complex-data/020-selecting-flat-data.md
@@ -3,17 +3,21 @@ title: "Selecting Flat Data"
parent: "Querying Complex Data"
---
A very simple query against the `donuts.json` file returns the values for the
-four "flat" columns (the columns that contain data at the top level only: no
+five "flat" columns (the columns that contain data at the top level only: no
nested data):
0: jdbc:drill:zk=local> select id, type, name, ppu
from dfs.`/Users/brumsby/drill/donuts.json`;
- +------------+------------+------------+------------+
- | id | type | name | ppu |
- +------------+------------+------------+------------+
- | 0001 | donut | Cake | 0.55 |
- +------------+------------+------------+------------+
- 1 row selected (0.248 seconds)
+ +-------+--------+----------------+-------+
+ | id | type | name | ppu |
+ +-------+--------+----------------+-------+
+ | 0001 | donut | Cake | 0.55 |
+ | 0002 | donut | Raised | 0.69 |
+ | 0003 | donut | Old Fashioned | 0.55 |
+ | 0004 | donut | Filled | 0.69 |
+ | 0005 | donut | Apple Fritter | 1.0 |
+ +-------+--------+----------------+-------+
+ 5 rows selected (0.18 seconds)
Note that `dfs` is the schema name, the path to the file is enclosed by
backticks, and the query must end with a semicolon.
\ No newline at end of file
[03/10] drill git commit: minor edits
Posted by br...@apache.org.
minor edits
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/fff11f53
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/fff11f53
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/fff11f53
Branch: refs/heads/gh-pages
Commit: fff11f53b1a7118cf86d8f1916d2e62cce52502d
Parents: 42e6b1e
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Jun 10 11:23:07 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Jun 10 11:23:07 2015 -0700
----------------------------------------------------------------------
.../configuring-odbc/030-configuring-odbc-on-windows.md | 8 ++++----
.../030-installing-the-driver-on-windows.md | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/fff11f53/_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 d164cb5..d241b27 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
@@ -11,17 +11,17 @@ sources:
**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).
-## Create a Data Source Name (DSN)
+## Sample ODBC Configuration (DSN)
-Create a DSN to connect to Drill data sources. If
+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
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. Click **Start**, and locate the ODBC Administrator app that you installed, and click the ODBC Administrator app icon to start the app.
+1. Click **Start**, and locate the ODBC Administrator app that you installed, and click ODBC Administrator 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.
+2. On the **System DSN** tab in System Data Sources, select the sample 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**.
http://git-wip-us.apache.org/repos/asf/drill/blob/fff11f53/_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 e67c3cd..c2b97bd 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
@@ -17,10 +17,9 @@ To ensure success, install the MapR Drill ODBC Driver on a system that meets the
Each computer where you install the driver must meet the following system
requirements:
- * One of the following operating systems (32- and 64-bit editions are supported):
+ * The 32- and 64-bit editions of the following operating systems are recommended:
* Windows® 8 and 8.1
* Windows® 7 Professional
- * Windows® Server 2012, 2012 R2
* Windows® Server 2008, 2013 R2
* .NET Framework 4.5, installed and enabled by default on Windows 8 and later
* 60 MB of available disk space