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/09 01:06:52 UTC
[03/15] drill git commit: Bridget's MapR-DB edit
Bridget's MapR-DB edit
DRILL-3078
squash Bridget's MapR-DB edit and DRILL-3078 fixes
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/4964f81a
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/4964f81a
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/4964f81a
Branch: refs/heads/gh-pages
Commit: 4964f81a02b0477365e052e91f2f1871ec33e5af
Parents: 1f91a07
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Wed Jun 3 14:39:58 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Wed Jun 3 14:42:13 2015 -0700
----------------------------------------------------------------------
.../connect-a-data-source/100-mapr-db-format.md | 9 +++---
.../010-installing-the-driver-on-linux.md | 8 +++---
.../020-installing-the-driver-on-mac-os-x.md | 15 +++++-----
...iguring-connections-on-linux-and-mac-os-x.md | 29 ++++++++------------
4 files changed, 27 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/4964f81a/_docs/connect-a-data-source/100-mapr-db-format.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/100-mapr-db-format.md b/_docs/connect-a-data-source/100-mapr-db-format.md
old mode 100644
new mode 100755
index e1ac5aa..25098dd
--- a/_docs/connect-a-data-source/100-mapr-db-format.md
+++ b/_docs/connect-a-data-source/100-mapr-db-format.md
@@ -2,10 +2,11 @@
title: "MapR-DB Format"
parent: "Connect a Data Source"
---
-The MapR-DB format is not included in Apache Drill release. If you install Drill from the `mapr-drill` package on a MapR node, the MapR-DB format appears in the `dfs` storage plugin instance. The `maprdb` format improves the
+The MapR-DB format is not included in apache drill release. Drill includes a `maprdb` format for MapR-DB that is defined within the
+default `dfs` storage plugin instance when you install Drill from the `mapr-drill` package on a MapR node. The `maprdb` format improves the
estimated number of rows that Drill uses to plan a query. It also enables you
-to query tables as you would query files in a file system because MapR-DB
-and MapR-FS share the same namespace.
+to query tables like you would query files in a file system because MapR-DB
+and MapR-FS share the same namespace.
You can query tables stored across multiple directories. You do not need to
create a table mapping to a directory before you query a table in the
@@ -13,7 +14,7 @@ directory. You can select from any table in any directory the same way you
would select from files in MapR-FS, using the same syntax.
Instead of including the name of a file, you include the table name in the
-query.
+query. The userid running the query must have read permission to access the MapR table.
**Example**
http://git-wip-us.apache.org/repos/asf/drill/blob/4964f81a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/010-installing-the-driver-on-linux.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/010-installing-the-driver-on-linux.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/010-installing-the-driver-on-linux.md
index 1957363..59361d4 100755
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/010-installing-the-driver-on-linux.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/010-installing-the-driver-on-linux.md
@@ -34,7 +34,7 @@ Verify that your system meets the system requirements before you start.
If not, create the following entry in `/etc/hosts` for the Drill node(s):
`<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.
@@ -96,11 +96,11 @@ You can have both 32- and 64-bit versions of the driver installed at the same ti
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
+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`
-Refer to your Linux shell documentation for details on how to set environment
-variables permanently.
+
#### Next Step
http://git-wip-us.apache.org/repos/asf/drill/blob/4964f81a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/020-installing-the-driver-on-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/020-installing-the-driver-on-mac-os-x.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/020-installing-the-driver-on-mac-os-x.md
index ccc07a0..40c4205 100755
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/020-installing-the-driver-on-mac-os-x.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/020-installing-the-driver-on-mac-os-x.md
@@ -21,11 +21,11 @@ Verify that your system meets the following prerequisites before you start.
* Mac OS X version 10.6.8 or later
* 100 MB of available disk space
- * iODBC 3.52.7 or above
+ * iODBC 3.52.7 or later
* 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):
`<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.
@@ -58,17 +58,16 @@ To install the driver, complete the following steps:
## Step 3: Updating the DYLD_LIBRARY_PATH Environment Variable
-The DYLD_LIBRARY_PATH environment variable must include paths to the following
+The Dynamic Link editor library path environment variable DYLD_LIBRARY_PATH must include paths to the following
libraries:
- * Installed ODBC driver manager libraries
+ * Installed iODBC driver manager libraries: libiodbc.dylib and libiodbcinst.dylib
* Installed MapR Drill ODBC Driver for Drill shared libraries
-For example, if the ODBC driver manager libraries are installed in
-`/usr/local/lib`, then set `DYLD_LIBRARY_PATH` to the following:
+For example, if the iODBC driver manager using the DMG provided on the iODBC web site, libraries are installed in
+`/usr/local/iODBC/lib`, then set `DYLD_LIBRARY_PATH` to include that path and the path to the MapR Drill ODBC Driver. For example, use the following command to set the environment variable to both paths:
-`export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/lib:/opt/mapr/drillodb
-c/lib/universal`
+`export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:/usr/local/iODBC/lib:/opt/mapr/drillodbc/lib/universal`
#### Next Step
http://git-wip-us.apache.org/repos/asf/drill/blob/4964f81a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/030-configuring-connections-on-linux-and-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/030-configuring-connections-on-linux-and-mac-os-x.md b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/030-configuring-connections-on-linux-and-mac-os-x.md
index f947bb5..128af31 100644
--- a/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/030-configuring-connections-on-linux-and-mac-os-x.md
+++ b/_docs/odbc-jdbc-interfaces/using-odbc-on-linux-and-mac-os-x/030-configuring-connections-on-linux-and-mac-os-x.md
@@ -10,44 +10,37 @@ on Linux or Mac OS X, you must update the following configuration files:
* `odbcinst.ini`
* `mapr.drillodbc.ini`
-You can locate the configuration files in your home directory, or in`
-/opt/mapr/drillobdc/Setup`.
+You can locate the configuration in `/opt/mapr/drillobdc/Setup`.
{% include startnote.html %}The installer for the Mac OS X version of the driver creates a sample User DSN that some driver managers use in ~/Library/ODBC/odbc.ini and ~/.odbc.ini.{% include endnote.html %}
To configure an ODBC connection for Linux or Mac OS X, complete the following
steps:
- * Step 1: Set Evironment Variables (Linux only)
+ * 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
-Once you have completed the required steps, refer to [Testing the ODBC
-Connection on Linux and Mac OS X]({{ site.baseurl }}/docs/testing-the-odbc-connection).
-
## Sample Configuration Files
The driver installation contains sample configuration files in the ~/`Setup`
directory that you can use as a reference.
-The sample files appear in the directory listings by default because the
-filenames do not begin with a (.) Filenames that begin with a (.) are hidden.
-If the default location is used for `odbc.ini` and `odbcinst.ini`, file names
-must begin with a period (.). For `mapr.drillodbc.ini`, the file name must
-begin with a (.) and must reside in your home directory.
-
If the configuration files do not already exist in your home directory, copy
-the sample configuration files to that directory and rename them. If the
-configuration files already exist in your home directory, you can use the
-sample configuration files as a guide for modifying the existing configuration
-files.
+the sample configuration files to that directory and rename them as hidden files:
+
+* .mapr.drillodbc.ini
+* .odbc.ini
+* .odbcinst.ini
+
+If the configuration files already exist in your home directory, you can use the sample configuration files as a guide for modifying the existing configuration files.
----------
-## Step 1: Set Evironment Variables (Linux only)
+## Step 1: Set Environment Variables (Linux only)
-You must set the following environment variables to point to the` odbc.ini`
+Set the following environment variables to point to the` odbc.ini`
and `mapr.drillodbc.ini `configuration files, respectively:
* `ODBCINI` (point to `odbc.ini`)