drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bridg...@apache.org
Subject drill git commit: edits to drill 1.11 docs
Date Fri, 18 Aug 2017 17:49:38 GMT
Repository: drill
Updated Branches:
  refs/heads/gh-pages bfe570561 -> 2322c4881


edits to drill 1.11 docs


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

Branch: refs/heads/gh-pages
Commit: 2322c4881af7f6e2ab6082f08fed371dc6c86601
Parents: bfe5705
Author: Bridget Bevens <bbevens@maprtech.com>
Authored: Fri Aug 18 10:47:26 2017 -0700
Committer: Bridget Bevens <bbevens@maprtech.com>
Committed: Fri Aug 18 10:47:26 2017 -0700

----------------------------------------------------------------------
 .../020-configuring-drill-memory.md             |   4 +-
 .../010-configuration-options-introduction.md   |   4 +-
 .../090-configuring-kerberos-security.md        |   8 +-
 .../drill-channel-pipeline-with-handlers.png    | Bin 14051 -> 42409 bytes
 .../010-interfaces-introduction.md              |  14 +-
 .../010-odbc-configuration-reference.md         |  10 +-
 .../configuring-odbc/011-logging-and-tracing.md | 179 +++++++++++++++++++
 .../configuring-odbc/011-logging-tracing.md     | 179 -------------------
 .../020-configuring-odbc-on-linux.md            |   6 +-
 .../010-installing-the-driver-on-linux.md       |  16 +-
 .../020-installing-the-driver-on-mac-os-x.md    |   5 +-
 .../030-installing-the-driver-on-windows.md     |  18 +-
 ...d-hash-based-memory-constrained-operators.md |   4 +-
 13 files changed, 221 insertions(+), 226 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_docs/configure-drill/020-configuring-drill-memory.md
----------------------------------------------------------------------
diff --git a/_docs/configure-drill/020-configuring-drill-memory.md b/_docs/configure-drill/020-configuring-drill-memory.md
index 5949cab..4b5c48c 100644
--- a/_docs/configure-drill/020-configuring-drill-memory.md
+++ b/_docs/configure-drill/020-configuring-drill-memory.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuring Drill Memory"
-date: 2017-08-17 21:20:15 UTC
+date: 2017-08-18 17:47:31 UTC
 parent: "Configure Drill"
 ---
 
@@ -16,7 +16,7 @@ As of Drill 1.5, Drill uses a new allocator that improves an operator’s use of
 
 
 ## Drillbit Memory  
-The value set for the [`planner.memory.max_query_memory_per_node`]({{site.baseurl}}/docs/configuration-options-introduction/#system-options) system option sets the maximum amount of direct memory allocated to the Sort and Hash Aggreate operators in each query on a node. If a query plan contains multiple Sort and/or Hash Aggregate operators, they all share this memory. If you encounter memory issues when running queries with Sort and/or Hash Aggregate operators, increase the value of this option. See [Sort-Based and Hash-Based Memory Constrained Operators](https://drill.apache.org/docs/sort-based-and-hash-based-memory-constrained-operators/) for more information.  
+The value set for the [`planner.memory.max_query_memory_per_node`]({{site.baseurl}}/docs/configuration-options-introduction/#system-options) system option sets the maximum amount of direct memory allocated to the Sort and Hash Aggreate operators in each query on a node. If a query plan contains multiple Sort and/or Hash Aggregate operators, they all share this memory. The default limit is set to 2147483648 bytes (2GB), which should be increased for queries on large data sets. If you encounter memory issues when running queries with Sort and/or Hash Aggregate operators, increase the value of this option. See [Sort-Based and Hash-Based Memory Constrained Operators](https://drill.apache.org/docs/sort-based-and-hash-based-memory-constrained-operators/) for more information.  
 
 If you continue to encounter memory issues after increasing this value, you can also reduce the value of the [`planner.width.max_per_node`]({{site.baseurl}}/docs/configuration-options-introduction/) option to reduce the level of parallelism per node. However, this may increase the amount of time required for a query to complete. 
 

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_docs/configure-drill/configuration-options/010-configuration-options-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/configure-drill/configuration-options/010-configuration-options-introduction.md b/_docs/configure-drill/configuration-options/010-configuration-options-introduction.md
index 65566f5..3320275 100644
--- a/_docs/configure-drill/configuration-options/010-configuration-options-introduction.md
+++ b/_docs/configure-drill/configuration-options/010-configuration-options-introduction.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration Options Introduction"
-date: 2017-08-17 22:46:40 UTC
+date: 2017-08-18 17:47:34 UTC
 parent: "Configuration Options"
 ---
 
@@ -68,7 +68,7 @@ The sys.options table lists ptions that you can set at the system or session lev
 | planner.memory.enable_memory_estimation           | FALSE                                             | Toggles   the state of memory estimation and re-planning of the query. When enabled,   Drill conservatively estimates memory requirements and typically excludes   these operators from the plan and negatively impacts performance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       
                                                                                                                                                                                                                             |
 | planner.memory.hash_agg_table_factor              | 1.1                                               | A   heuristic value for influencing the size of the hash aggregation table.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
                                                                                                                                                                                                                             |
 | planner.memory.hash_join_table_factor             | 1.1                                               | A   heuristic value for influencing the size of the hash aggregation table.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
                                                                                                                                                                                                                             |
-| planner.memory.max_query_memory_per_node          | 2147483648   bytes                                | Sets   the maximum amount of direct memory allocated to the Sort and Hash Aggregate   operators during each query on a node. This memory is split between   operators. If a query plan contains multiple Sort and/or Hash Aggregate   operators, the memory is divided between them. The default setting is too small for queries on large data sets and should be increased.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
                                                                                                                                                                                                                                                                          |
+| planner.memory.max_query_memory_per_node          | 2147483648   bytes                                | Sets   the maximum amount of direct memory allocated to the Sort and Hash Aggregate   operators during each query on a node. This memory is split between   operators. If a query plan contains multiple Sort and/or Hash Aggregate   operators, the memory is divided between them. The default limit should be increased for queries on large data sets.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
                                                                                                                                                                                                                                                       |
 | planner.memory.non_blocking_operators_memory      | 64                                                | Extra   query memory per node for non-blocking operators. This option is currently   used only for memory estimation. Range: 0-2048 MB                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     
                                                                                                                                                                                                                             |
 | planner.memory_limit                              | 268435456   bytes                                 | Defines   the maximum amount of direct memory allocated to a query for planning. When   multiple queries run concurrently, each query is allocated the amount of   memory set by this parameter.Increase the value of this parameter and rerun   the query if partition pruning failed due to insufficient memory.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         
                                                                                                                                                                                                                             |
 | planner.nestedloopjoin_factor                     | 100                                               | A   heuristic value for influencing the nested loop join.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
                                                                                                                                                                                                                             |

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_docs/configure-drill/securing-drill/090-configuring-kerberos-security.md
----------------------------------------------------------------------
diff --git a/_docs/configure-drill/securing-drill/090-configuring-kerberos-security.md b/_docs/configure-drill/securing-drill/090-configuring-kerberos-security.md
index 6730d40..c3d93c8 100644
--- a/_docs/configure-drill/securing-drill/090-configuring-kerberos-security.md
+++ b/_docs/configure-drill/securing-drill/090-configuring-kerberos-security.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuring Kerberos Security"
-date: 2017-08-17 18:54:38 UTC
+date: 2017-08-18 17:47:38 UTC
 parent: "Securing Drill"
 ---
 Drill 1.11 supports Kerberos v5 network security authentication and encryption for Kerberos. To use Kerberos with Drill and establish connectivity, use the JDBC driver packaged with Drill.
@@ -14,7 +14,7 @@ See the [MIT Kerberos](http://web.mit.edu/kerberos/ "MIT Kerberos") documentatio
 
 ## Prerequisites
 
-The required Kerberos (JDBC) plugin is part of the Drill 1.11 package. To use it, you must have a working Kerberos infrastructure, which Drill does not provide. You must be working in a Linux-based or Windows Active Directory (AD) Kerberos environment with secure clusters and have a Drill server configured for Kerberos. See [Enabling Authentication]({{site.baseurl}}/docs/configuring-kerberos-authentication/#enabling-authentication).
+The required Kerberos (JDBC) plugin is part of the Drill 1.11 package. To use it, you must have a working Kerberos infrastructure, which Drill does not provide. You must be working in a Linux-based or Windows Active Directory (AD) Kerberos environment with secure clusters and have a Drill server configured for Kerberos. See [Enabling Authentication and Encryption]({{site.baseurl}}/docs/configuring-kerberos-authentication/#enabling-authentication-and-encryption).
 
 ## Client Authentication Process 
 
@@ -40,7 +40,7 @@ For Kerberos server authentication information, see the [MIT Kerberos](http://we
 ### Enabling Authentication and Encryption
 During startup, a drillbit service must authenticate. At runtime, Drill uses the keytab file. Trust is based on the keytab file; its secrets are shared with the KDC. The drillbit service also uses this keytab credential to validate service tickets from clients. Based on this information, the drillbit determines whether the client’s identity can be verified to use its service. 
 
-With encryption enabled, negotiation occurs for the most secure level of encryption. A strong cipher is used from the available KDC-supported encryption types. Set the `security.user.encryption.sasl.enabled` property to **true** as shown in step 3.  This property facilitates the SASL negotiation with the Kerberos mechanism between the client and drillbit with the quality of protection (qop) set to the authentication with confidentiality (auth-conf) value.               
+With encryption enabled, negotiation occurs for the most secure level of encryption. A strong cipher is used from the available KDC-supported encryption types. Set the `security.user.encryption.sasl.enabled` property to **true** as shown in step 2a.  This property facilitates the SASL negotiation with the Kerberos mechanism between the client and drillbit with the quality of protection (qop) set to the authentication with confidentiality (auth-conf) value.               
 
 &nbsp;1. Create a Kerberos principal identity and a keytab file.  You can create one principal for each drillbit or one principal for all drillbits in a cluster. The `drill.keytab` file must be owned by and readable by the administrator user.  
  
@@ -62,7 +62,7 @@ With encryption enabled, negotiation occurs for the most secure level of encrypt
 &nbsp;
 2. Add the Kerberos principal identity and keytab file to the `drill-override.conf` file. The instance name must be lowercase. Also, if \_HOST is set as the instance name in the principal, it is replaced with the fully qualified domain name of that host for the instance name. For example, if a drillbit running on `host01.aws.lab` uses `drill/_HOST@<EXAMPLE>.COM` as the principal, the canonicalized principal is `drill/host01.aws.lab@<EXAMPLE>.COM`.
 
-To configure multiple mechanisms, extend the mechanisms list and provide additional configuration parameters. For example, the following configuration enables Kerberos and Plain (username and password) mechanisms. See [Installing and Connfiguring Plain Authentication]({{site.baseurl}}/docs/configuring-plain-authentication/#installing-and-configuring-plain-authentication) for Plain PAM configuration instructions.  
+To configure multiple mechanisms, extend the mechanisms list and provide additional configuration parameters. For example, the following configuration enables Kerberos and Plain (username and password) mechanisms. See [Installing and Configuring Plain Authentication]({{site.baseurl}}/docs/configuring-plain-authentication/#installing-and-configuring-plain-authentication) for Plain PAM configuration instructions.  
 
               drill.exec: {
                 cluster-id: "drillbits1",

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_docs/img/drill-channel-pipeline-with-handlers.png
----------------------------------------------------------------------
diff --git a/_docs/img/drill-channel-pipeline-with-handlers.png b/_docs/img/drill-channel-pipeline-with-handlers.png
index 6272cc1..0de3a14 100644
Binary files a/_docs/img/drill-channel-pipeline-with-handlers.png and b/_docs/img/drill-channel-pipeline-with-handlers.png differ

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_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 333ad90..979f12b 100644
--- a/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
+++ b/_docs/odbc-jdbc-interfaces/010-interfaces-introduction.md
@@ -1,6 +1,6 @@
 ---
 title: "Interfaces Introduction"
-date: 2017-05-09 01:40:52 UTC
+date: 2017-08-18 17:47:49 UTC
 parent: "ODBC/JDBC Interfaces"
 ---
 You can connect to Apache Drill through the following interfaces:
@@ -15,7 +15,7 @@ You can connect to Apache Drill through the following interfaces:
 
 ## Using ODBC to Access Apache Drill from BI Tools
 
-MapR provides an ODBC 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 an older version of Drill may not work with an upgraded version of Drill.
+MapR provides an ODBC 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. 
 
 Access the latest MapR Drill ODBC drivers at [http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/).
 
@@ -25,16 +25,16 @@ You can connect to Drill through a JDBC client tool, such as SQuirreL, on
 Windows, Linux, and Mac OS X systems, to access all of your data sources
 registered with Drill. An embedded JDBC driver is included with Drill.
 Configure the JDBC driver in the SQuirreL client to connect to Drill from
-SQuirreL. This document provides instruction for connecting to Drill from
+SQuirreL. This section provides instruction for connecting to Drill from
 SQuirreL on Windows.
 
 To use the Drill JDBC driver with SQuirreL on Windows, complete the following
 steps:
 
-  * [Step 1: Getting the Drill JDBC Driver]({{ site.baseurl }}/docs/using-jdbc/#step-1:-getting-the-drill-jdbc-driver) 
-  * [Step 2: Installing and Starting SQuirreL]({{ site.baseurl }}/docs/using-jdbc/#step-2:-installing-and-starting-squirrel)
-  * [Step 3: Adding the Drill JDBC Driver to SQuirreL]({{ site.baseurl }}/docs/using-jdbc/#step-3:-adding-the-drill-jdbc-driver-to-squirrel)
-  * [Step 4: Running a Drill Query from SQuirreL]({{ site.baseurl }}/docs/using-jdbc/#step-4:-running-a-drill-query-from-squirrel)
+  * [Step 1: Getting the Drill JDBC Driver]({{ site.baseurl }}/docs/using-the-jdbc-driver/#getting-the-drill-jdbc-driver) 
+  * [Step 2: Installing and Starting SQuirreL]({{ site.baseurl }}/docs/using-jdbc-with-squirrel-on-windows/#step-2:-installing-and-starting-squirrel)
+  * [Step 3: Adding the Drill JDBC Driver to SQuirreL]({{ site.baseurl }}/docs/using-jdbc-with-squirrel-on-windows/#step-3:-adding-the-drill-jdbc-driver-to-squirrel)
+  * [Step 4: Running a Drill Query from SQuirreL]({{ site.baseurl }}/docs/using-jdbc-with-squirrel-on-windows/#step-4:-running-a-drill-query-from-squirrel)
 
 For information about how to use SQuirreL, refer to the [SQuirreL Quick
 Start](http://squirrel-sql.sourceforge.net/user-manual/quick_start.html)

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_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 86828ea..d8038d4 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
@@ -1,6 +1,6 @@
 ---
 title: "ODBC Configuration Reference"
-date: 2017-08-17 18:54:52 UTC
+date: 2017-08-18 17:47:53 UTC
 parent: "Configuring ODBC"
 ---
 You can use various configuration options to control the behavior of the Drill ODBC Driver. You can use these options in a connection string or in the `odbc.ini` configuration file for the Mac OS X version or the driver.
@@ -19,10 +19,10 @@ The following table provides a list of the configuration options and a brief des
 | ConnectionType | Direct to Drillbit (Direct) | Required. This option specifies whether the driver connects to a single server or a ZooKeeper cluster. Direct to Drillbit (Direct): The driver connects to a single Drill server. ZooKeeper Quorum (ZooKeeper): The driver connects to a ZooKeeper cluster. |
 | DelegationUID | none | Not required. If a value is specified for this setting, the driver delegates all operations against Drill to the specified user, rather than to the authenticated user for the connection. This option is applicable only when Plain authentication is enabled. |
 | DisableAsync | Clear (0) | Not required. This option specifies whether the driver supports asynchronous queries.   Enabled (1): The driver does not support asynchronous queries. Disabled (0): The driver supports asynchronous queries. This option is not supported in connection strings or DSNs. Instead, it must be set as a driver-wide property in the mapr.drillodbc.ini file. Settings in that file apply to all connections that use the driver. |
-| Driver | MapR Drill ODBC Driver on Windows machines or the absolute path of the driver shared object file when installed on a non-Windows machine | On Windows, the name of the installed driver (MapR Drill ODBC Driver). On other platforms, the name of the installed driver as specified in odbcinst.ini, or the absolute path of the driver shared object file. |
+| Driver | Drill ODBC Driver on Windows machines or the absolute path of the driver shared object file when installed on a non-Windows machine | On Windows, the name of the installed driver (Drill ODBC Driver). On other platforms, the name of the installed driver as specified in odbcinst.ini, or the absolute path of the driver shared object file. |
 | Host | localhost | Required if the ConnectionType property is set to Direct to Drillbit. The IP address or host name of the Drill server. |
 | KrbServiceHost | none | Required for Kerberos authentication. The fully qualified domain name of the Drill server host. |
-| KrbServiceName | `map` (default) | Required for Kerberos authentication. The Kerberos service principal name of the Drill server. mapr is the default for the MapR Drill ODBC driver. |
+| KrbServiceName | `map` (default) | Required for Kerberos authentication. The Kerberos service principal name of the Drill server. mapr is the default for the Drill ODBC driver. |
 | LogLevel | OFF (0) | Not required. Use this property to enable or disable logging in the driver and to specify the amount of detail included in log files. Only enable logging long enough to capture an issue. Logging decreases performance and can consume a large quantity of disk space.   This option is not supported in connection strings. To configure logging for the Windows driver, you must use the Logging Options dialog box. To configure logging for a non-Windows driver, you must use the mapr.drillodbc.ini file. |
 | LogPath | none | Required if logging is enabled. The full path to the folder where the driver saves log files when logging is enabled. When logging is enabled, the driver produces two log files at the location that you specify in the LogPath property:  driver.log provides a log of driver activities, and  drillclient.log provides a log of Drill client activities.   This option is not supported in connection strings. To configure logging for the Windows driver, you must use the Logging Options dialog box. To configure logging for a non-Windows driver, you must use the mapr.drillodbc.ini file. |
 | Port | 31010 | Required if the ConnectionType property is set to Direct to Drillbit. The TCP port that the Drill server uses to listen for client connections. Set the TCP port on which the Drill server is listening. |
@@ -71,7 +71,7 @@ When you choose to connect directly to a Drillbit, the ODBC driver connects to t
 
 ### Schema
 
-The name of a schema, or [storage plugin]({ site.baseurl }}/docs/storage-plugin-registration/), from the default schema list of the data sources that you have configured to
+The name of a schema, or [storage plugin]({{site.baseurl}}/docs/storage-plugin-registration/), from the default schema list of the data sources that you have configured to
 use with Drill. Queries on other schemas can still be issued by explicitly specifying the schema in the query.
 
 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.
@@ -95,7 +95,7 @@ For example, the following Advanced Properties string excludes the schemas named
 `Time:HandshakeTimeout=30;QueryTimeout=30;
 TimestampTZDisplayTimezone=utc;ExcludedSchemas=test,abc`
 
-The following table lists and describes the advanced properties that you can set when using the MapR Drill ODBC Driver.
+The following table lists and describes the advanced properties that you can set when using the Drill ODBC Driver.
 
 | Property                   | Default Values         | Brief Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 |----------------------------|------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_docs/odbc-jdbc-interfaces/configuring-odbc/011-logging-and-tracing.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/011-logging-and-tracing.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/011-logging-and-tracing.md
new file mode 100644
index 0000000..4ce7760
--- /dev/null
+++ b/_docs/odbc-jdbc-interfaces/configuring-odbc/011-logging-and-tracing.md
@@ -0,0 +1,179 @@
+---
+title: "Logging and Tracing"
+date: 2017-08-17 18:54:56 UTC
+parent: "Configuring ODBC"
+---
+
+## Logging Options
+
+Only enable logging long enough to capture information required to resolve an issue. Logging decreases performance and can consume a large quantity of disk space.
+
+If logging is enabled, the Drill ODBC driver logs events in the following log files in the log path that you configure:
+
+* `driver.log` provides a log of driver events.
+* `drillclient.log` provides a log of the Drill client events.
+
+### Logging Levels
+
+The following log levels are available:
+
+* (0) OFF: Disables logging.
+* (1) FATAL: Logs severe error events that may cause the driver to stop running.
+* (2) ERROR: Logs error events that may allow the driver to continue running.
+* (3) WARNING: Logs events that might result in an error if action is not taken.
+* (4) INFO: Logs general information that describes the progress of the driver.
+* (5) DEBUG: Logs detailed events that may help to debug issues.
+* (6) TRACE: Logs all driver activity, which includes more fine-grained events than the DEBUG level.
+
+### Non-Windows Platforms
+
+On non-Windows platforms, logging is configured through the driver-wide settings in the `mapr.drillodbc.ini` file, which apply to all connections using the driver. 
+
+
+#### Enable Logging
+
+To enable logging:
+
+1. Open the `.mapr.drillodbc.ini` configuration file in a text editor. (On Mac OS X, the default installation will install a .mapr.drillodbc.ini to $HOME.)
+
+2. Set the **LogLevel** key to the desired level of information to include in log files. 
+For example:
+
+      `LogLevel=2`
+
+3. Set the **LogPath** key to the full path to the folder where you want to save log files. 
+For example:  
+
+      `LogPath=/localhome/employee/logs`
+
+4. Save the `.mapr.drillodbc.ini` configuration file. The Drill ODBC Driver produces two log files at the location you specify using the **Log Path** field:  
+   * `driver.log` provides a log of driver activities.
+   * `drillclient.log` provides a log of Drill client activities.
+
+ 
+6. Restart the applciation to make sure that the new settings take effect. Configuration changes will not be picked up until the application reloads the driver.
+
+#### Disable Logging
+
+To disable logging:
+
+1. Open the `.mapr.drillodbc.ini` configuration file in a text editor.
+2. Set the **LogLevel** key to zero (`0`).
+3. Save the `.mapr.drillodbc.ini` configuration file.  
+4. Restart your ODBC application to make sure that the new settings take effect.
+
+### Windows Platforms
+
+On Windows, logging is available in the Windows **ODBC Data Source Administrator** where you created the DSN. You must run `C:\Windows\SysWOW64\odbcad32.exe` to access and modify 32-bit DSNs on 64-bit Windows.
+
+#### Enable Logging
+
+To enable logging:
+
+1. Click **Start**, **All Programs**, and then click the program group corresponding to the driver. 
+
+2. Select the DSN for which you want to log activity.  
+
+3. Click **Configure**. 
+
+4. In the **DSN Setup** dialog box, click **Logging Options**.
+ 
+6. From the **Log Level** drop-down list, select the logging level corresponding to the amount of information that you want to include in log files.
+7. In the **Log Path** (or Log Directory) field, specify the full path to the folder where you want to save log files. 
+
+8. If necessary (for example, if requested by a Support team), type the name of the component for which to log messages in the **Log Namespace** field. Otherwise, do not type a value in the field.
+9. Click **OK** to close the Logging Options dialog box.
+
+7. Click **OK** to save your settings and close the **DSN Configuration** dialog box. Configuration changes will not be saved of picked up by the driver until you have clicked **OK** in the **DSN Configuration **dialog box. Click **Cancel** (or the X button) to discard changes.
+
+8. Restart the application to make sure that the new settings take effect. Configuration changes will not be picked up by until the application reloads the driver.
+
+
+#### Disable Logging
+
+To disable logging:
+
+1. Select the DSN. 
+2. Click **Configure**. 
+3. Click **Logging Options**.
+4. From the **Log Level** drop-down list, select **LOG_OFF**.
+5. Click **OK**. 
+6. Restart your ODBC application to make sure that the new settings take effect. 
+
+## Driver Manager Tracing
+
+The driver manager trace facility, is a useful way to troubleshoot ODBC driver issues.You can choose from several driver managers, depending on which platform you use.
+
+{% include startimportant.html %}Tracing is active only for applications started after tracing has started. Currently-executing applications will not have tracing enabled. You must restart applications to enable tracing. You may need to restart services for applications, or you may have to restart the machine to properly enable tracing.{% include endimportant.html %}
+
+
+### OSX and Other Non-Windows Platforms
+
+iODBC is the default driver manager on OSX and can sometimes be found on other non-Windows platforms. 
+
+
+#### Enable Trace Logging
+
+To enable trace logging:
+
+1. Locate your `maprdrill.odbc.ini` file. This often located in your home directory. It might be a hidden file.
+2. Open the file and add the following key-value pairs under the section heading **[ODBC]**. If the heading does not exist, add it. For example:
+	
+	`[ODBC]`
+
+	`Trace=1`
+
+	`TraceFile=/path/to/file/traceFile.log`
+
+	`[ODBC Data Sources]`
+
+#### Disable Trace Logging
+
+When the trace is complete, disable tracing because tracing will consume disk space and significantly impact performance.
+
+1. Locate your `maprdrill.odbc.ini` file. This often located in your home directory. It might be a hidden file.
+2. Open the file and add the following key-value pairs under the section heading **[ODBC]**. For example:
+
+	`[ODBC]`
+
+	`Trace=0`
+
+	`TraceFile=/path/to/file/traceFile.log`
+
+	`[ODBC Data Sources]`
+
+1. (Again, this action will only impact applications that have just started, not currently-executing applications.) Restart your application.
+
+
+### OSX and Other Non-Windows Platforms
+
+#### Enable Trace Logging
+
+To enable tracing on Windows:
+
+1. Open the **ODBC Data Source Administrator**. 
+1. Go to the **Tracing** tab.
+
+
+![logtrace]({{site.baseurl}}/docs/img/odbctrace.png)
+
+
+1. Change the **Log File Path** field to be the location and name of the file to which you’d like to write the trace entries.
+
+
+1. (Optional) Check **Machine-wide tracing** for all user identities if you want the tracing to affect all users on the machine. If you are unsure, check this box.
+
+
+1. Press **Start Tracing Now**. 
+
+#### Disable Trace Logging
+
+When the trace is complete, disable tracing because tracing will consume disk space and significantly impact performance.
+
+1. Open the **ODBC Data Source Administrator**. 
+1. Go to the **Tracing** tab.
+1. Press Stop **Tracing Now**.  (Again, this action will only impact applications that have just started, not currently-executing applications.)
+1. Restart your application.
+
+For more information about generating ODBC traces, see [How To Generate an ODBC Trace with ODBC Data Source Administrator.
+](https://support.microsoft.com/en-us/help/274551/how-to-generate-an-odbc-trace-with-odbc-data-source-administrator)

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_docs/odbc-jdbc-interfaces/configuring-odbc/011-logging-tracing.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/configuring-odbc/011-logging-tracing.md b/_docs/odbc-jdbc-interfaces/configuring-odbc/011-logging-tracing.md
deleted file mode 100644
index d833a13..0000000
--- a/_docs/odbc-jdbc-interfaces/configuring-odbc/011-logging-tracing.md
+++ /dev/null
@@ -1,179 +0,0 @@
----
-title: "Logging Tracing"
-date: 2017-08-17 18:54:56 UTC
-parent: "Configuring ODBC"
----
-
-## Logging Options
-
-Only enable logging long enough to capture information required to resolve an issue. Logging decreases performance and can consume a large quantity of disk space.
-
-If logging is enabled, the Drill ODBC driver logs events in the following log files in the log path that you configure:
-
-* `driver.log` provides a log of driver events.
-* `drillclient.log` provides a log of the Drill client events.
-
-### Logging Levels
-
-The following log levels are available:
-
-* (0) OFF: Disables logging.
-* (1) FATAL: Logs severe error events that may cause the driver to stop running.
-* (2) ERROR: Logs error events that may allow the driver to continue running.
-* (3) WARNING: Logs events that might result in an error if action is not taken.
-* (4) INFO: Logs general information that describes the progress of the driver.
-* (5) DEBUG: Logs detailed events that may help to debug issues.
-* (6) TRACE: Logs all driver activity, which includes more fine-grained events than the DEBUG level.
-
-### Non-Windows Platforms
-
-On non-Windows platforms, logging is configured through the driver-wide settings in the `mapr.drillodbc.ini` file, which apply to all connections using the driver. 
-
-
-#### Enable Logging
-
-To enable logging:
-
-1. Open the `.mapr.drillodbc.ini` configuration file in a text editor. (On Mac OS X, the default installation will install a .mapr.drillodbc.ini to $HOME.)
-
-2. Set the **LogLevel** key to the desired level of information to include in log files. 
-For example:
-
-      `LogLevel=2`
-
-3. Set the **LogPath** key to the full path to the folder where you want to save log files. 
-For example:  
-
-      `LogPath=/localhome/employee/logs`
-
-4. Save the `.mapr.drillodbc.ini` configuration file. The Drill ODBC Driver produces two log files at the location you specify using the **Log Path** field:  
-   * `driver.log` provides a log of driver activities.
-   * `drillclient.log` provides a log of Drill client activities.
-
- 
-6. Restart the applciation to make sure that the new settings take effect. Configuration changes will not be picked up until the application reloads the driver.
-
-#### Disable Logging
-
-To disable logging:
-
-1. Open the `.mapr.drillodbc.ini` configuration file in a text editor.
-2. Set the **LogLevel** key to zero (`0`).
-3. Save the `.mapr.drillodbc.ini` configuration file.  
-4. Restart your ODBC application to make sure that the new settings take effect.
-
-### Windows Platforms
-
-On Windows, logging is available in the Windows **ODBC Data Source Administrator** where you created the DSN. You must run `C:\Windows\SysWOW64\odbcad32.exe` to access and modify 32-bit DSNs on 64-bit Windows.
-
-#### Enable Logging
-
-To enable logging:
-
-1. Click **Start**, **All Programs**, and then click the program group corresponding to the driver. 
-
-2. Select the DSN for which you want to log activity.  
-
-3. Click **Configure**. 
-
-4. In the **DSN Setup** dialog box, click **Logging Options**.
- 
-6. From the **Log Level** drop-down list, select the logging level corresponding to the amount of information that you want to include in log files.
-7. In the **Log Path** (or Log Directory) field, specify the full path to the folder where you want to save log files. 
-
-8. If necessary (for example, if requested by a Support team), type the name of the component for which to log messages in the **Log Namespace** field. Otherwise, do not type a value in the field.
-9. Click **OK** to close the Logging Options dialog box.
-
-7. Click **OK** to save your settings and close the **DSN Configuration** dialog box. Configuration changes will not be saved of picked up by the driver until you have clicked **OK** in the **DSN Configuration **dialog box. Click **Cancel** (or the X button) to discard changes.
-
-8. Restart the application to make sure that the new settings take effect. Configuration changes will not be picked up by until the application reloads the driver.
-
-
-#### Disable Logging
-
-To disable logging:
-
-1. Select the DSN. 
-2. Click **Configure**. 
-3. Click **Logging Options**.
-4. From the **Log Level** drop-down list, select **LOG_OFF**.
-5. Click **OK**. 
-6. Restart your ODBC application to make sure that the new settings take effect. 
-
-## Driver Manager Tracing
-
-The driver manager trace facility, is a useful way to troubleshoot ODBC driver issues.You can choose from several driver managers, depending on which platform you use.
-
-{% include startimportant.html %}Tracing is active only for applications started after tracing has started. Currently-executing applications will not have tracing enabled. You must restart applications to enable tracing. You may need to restart services for applications, or you may have to restart the machine to properly enable tracing.{% include endimportant.html %}
-
-
-### OSX and Other Non-Windows Platforms
-
-iODBC is the default driver manager on OSX and can sometimes be found on other non-Windows platforms. 
-
-
-#### Enable Trace Logging
-
-To enable trace logging:
-
-1. Locate your `maprdrill.odbc.ini` file. This often located in your home directory. It might be a hidden file.
-2. Open the file and add the following key-value pairs under the section heading **[ODBC]**. If the heading does not exist, add it. For example:
-	
-	`[ODBC]`
-
-	`Trace=1`
-
-	`TraceFile=/path/to/file/traceFile.log`
-
-	`[ODBC Data Sources]`
-
-#### Disable Trace Logging
-
-When the trace is complete, disable tracing because tracing will consume disk space and significantly impact performance.
-
-1. Locate your `maprdrill.odbc.ini` file. This often located in your home directory. It might be a hidden file.
-2. Open the file and add the following key-value pairs under the section heading **[ODBC]**. For example:
-
-	`[ODBC]`
-
-	`Trace=0`
-
-	`TraceFile=/path/to/file/traceFile.log`
-
-	`[ODBC Data Sources]`
-
-1. (Again, this action will only impact applications that have just started, not currently-executing applications.) Restart your application.
-
-
-### OSX and Other Non-Windows Platforms
-
-#### Enable Trace Logging
-
-To enable tracing on Windows:
-
-1. Open the **ODBC Data Source Administrator**. 
-1. Go to the **Tracing** tab.
-
-
-![logtrace]({{site.baseurl}}/docs/img/odbctrace.png)
-
-
-1. Change the **Log File Path** field to be the location and name of the file to which you’d like to write the trace entries.
-
-
-1. (Optional) Check **Machine-wide tracing** for all user identities if you want the tracing to affect all users on the machine. If you are unsure, check this box.
-
-
-1. Press **Start Tracing Now**. 
-
-#### Disable Trace Logging
-
-When the trace is complete, disable tracing because tracing will consume disk space and significantly impact performance.
-
-1. Open the **ODBC Data Source Administrator**. 
-1. Go to the **Tracing** tab.
-1. Press Stop **Tracing Now**.  (Again, this action will only impact applications that have just started, not currently-executing applications.)
-1. Restart your application.
-
-For more information about generating ODBC traces, see [How To Generate an ODBC Trace with ODBC Data Source Administrator.
-](https://support.microsoft.com/en-us/help/274551/how-to-generate-an-odbc-trace-with-odbc-data-source-administrator)

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_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
index efd9d27..27bcb16 100644
--- 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
@@ -1,6 +1,6 @@
 ---
 title: "Configuring ODBC on Linux"
-date: 2017-08-17 18:55:03 UTC
+date: 2017-08-18 17:47:57 UTC
 parent: "Configuring ODBC"
 ---
 
@@ -10,8 +10,8 @@ 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 Drill ODBC Driver]({{site.baseurl}}/docs/configuring-odbc-on-linux/#configuring-.mapr.drillodbc.ini)
+* [Step 3: (Optional) Define the ODBC Driver in .odbcinst.ini]({{site.baseurl}}/configuring-odbc-on-linux/#step-3:-(optional)-define-the-odbc-driver-in-.odbcinst.ini)
+* [Step 4: Configure the Drill ODBC Driver]({{site.baseurl}}/configuring-odbc-on-linux/#step-4:-configure-the-drill-odbc-driver)
 
 ## Sample Configuration Files
 

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_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 6f7f5ad..ce6be57 100644
--- 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
@@ -1,6 +1,6 @@
 ---
 title: "Installing the Driver on Linux"
-date: 2017-08-17 18:55:21 UTC
+date: 2017-08-18 17:48:00 UTC
 parent: "Installing the ODBC Driver"
 ---
 Install the Drill ODBC Driver on the machine from which you connect to
@@ -9,11 +9,11 @@ the version of the driver that matches the architecture of the client
 application that you use to access Drill. The 64-bit editions of Linux support
 32- and 64-bit applications.
 
-Install the MapR Drill ODBC Driver on a system that meets the [system requirements]({{site.baseurl}}/docs/installing-the-driver-on-linux/#system-requirements), and then complete the following steps described in detail in this document:
+Install the Drill ODBC Driver on a system that meets the [system requirements]({{site.baseurl}}/docs/installing-the-driver-on-linux/#system-requirements), and then complete the following steps described in detail in this document:
 
-  * [Step 1: Download the Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-linux/#step-1:-download-the-mapr-drill-odbc-driver) 
-  * [Step 2: Install the Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-linux/#step-2:-install-the-mapr-drill-odbc-driver)
-  * [Step 3: Check the Drill ODBC Driver version]({{site.baseurl}}/docs/installing-the-driver-on-linux/#step-3:-check-the-mapr-drill-odbc-driver-version)
+  * [Step 1: Download the Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-linux/#step-1:-download-the-drill-odbc-driver)
+  * [Step 2: Install the Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-linux/#step-2:-install-the-drill-odbc-driver)
+  * [Step 3: Check the Drill ODBC Driver Version]({{site.baseurl}}/docs/installing-the-driver-on-linux/#step-3:-check-the-drill-odbc-driver-version)
 
 Verify that your system meets the system requirements before you start.
 
@@ -25,11 +25,7 @@ Verify that your system meets the system requirements before you start.
     * CentOS 5, 6, or 7
     * SUSE Linux Enterprise Server (SLES) 11 or 12     
  * 90 MB of available disk space.
- * An installed ODBC driver manager:
-    * iODBC 3.52.7 or above  
-      or 
-    * unixODBC 2.2.14 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.  
+ * An installed ODBC driver manager such as, iODBC 3.52.7 (or above) or unixODBC 2.2.14 (or above). On Linux, iODBC 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 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>  

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_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 e7f1850..24bc07b 100644
--- 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
@@ -1,6 +1,6 @@
 ---
 title: "Installing the Driver on Mac OS X"
-date: 2017-08-17 18:55:25 UTC
+date: 2017-08-18 17:48:04 UTC
 parent: "Installing the ODBC Driver"
 ---
 Install the Drill ODBC Driver on the machine from which you connect to
@@ -64,5 +64,4 @@ To display information about the iODBC driver manager installed on the machine,
 
 ### Next Step
 
-[Configuring ODBC on Mac OS X]({{ site.baseurl }}/docs/configuring-odbc-on-mac-os-x/).
-
+[Configuring ODBC on Mac OS X]({{ site.baseurl }}/docs/configuring-odbc-on-mac-os-x/).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_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 8bad61a..690f29d 100644
--- 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
@@ -1,23 +1,23 @@
 ---
 title: "Installing the Driver on Windows"
-date: 2017-08-17 18:55:29 UTC
+date: 2017-08-18 17:48:08 UTC
 parent: "Installing the ODBC Driver"
 ---
 The Drill ODBC Driver installer is available for 32- and 64-bit
-applications on Windows®. On 64-bit Windows operating systems, you can execute both 32- and 64-bit applications. However, 64-bit applications must use 64-bit drivers, and 32-bit applications must use 32-bit drivers. Make sure that you use the driver version that matches the bitness of the client application machine. 
+applications on Windows. On 64-bit Windows operating systems, you can execute both 32- and 64-bit applications. However, 64-bit applications must use 64-bit drivers, and 32-bit applications must use 32-bit drivers. Make sure that you use the driver version that matches the bitness of the client application machine. 
 					
   * Drill 1.3 32-bit.msi for 32-bit applications
   * Drill 1.3 64-bit.msi for 64-bit applications  
 
   
-{% include startnote.html %}Currently Drill does not support a 32-bit Windows machine. However, the 32- or 64-bit MapR Drill ODBC Driver is supported on a 64-bit machine.{% include endnote.html %}
+{% include startnote.html %}Currently Drill does not support a 32-bit Windows machine. However, the 32- or 64-bit Drill ODBC Driver is supported on a 64-bit machine.{% include endnote.html %}
 
 
 To install the Drill ODBC Driver on a system that meets the system requirements, complete the following steps:  
 
    *  [Step 1: Download the Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-windows/#step-1:-download-the-drill-odbc-driver)
    *  [Step 2: Install the Drill ODBC Driver]({{site.baseurl}}/docs/installing-the-driver-on-windows/#step-2:-install-the-drill-odbc-driver) 
-   *  [Step 3: Verify the installation]({{site.baseurl}}/docs/installing-the-driver-on-windows/#step-3:-verify-the-installation) 
+   *  [Step 3: Verify the Installation]({{site.baseurl}}/docs/installing-the-driver-on-windows/#step-3:-verify-the-installation) 
 
 ##  System Requirements
 
@@ -39,7 +39,7 @@ requirements:
 
 	`127.0.0.1 localhost`
 
- {% include startnote.html %}Currently Drill does not support a 32-bit Windows machine; however, the 32- or 64-bit MapR Drill ODBC Driver is supported on a 64-bit machine.{% include endnote.html %}
+ {% include startnote.html %}Currently Drill does not support a 32-bit Windows machine; however, the 32- or 64-bit Drill ODBC Driver is supported on a 64-bit machine.{% include endnote.html %}
 
 To install the driver, you need Administrator privileges on the computer.
 
@@ -49,8 +49,8 @@ To install the driver, you need Administrator privileges on the computer.
 
 Download the installer that corresponds to the bitness of the client application from which you want to create an ODBC connection. The current version is 1.3.8.
 
-* [MapR Drill ODBC Driver (32-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/)  
-* [MapR Drill ODBC Driver (64-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/)
+* [Drill ODBC Driver (32-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/)  
+* [Drill ODBC Driver (64-bit)](http://package.mapr.com/tools/MapR-ODBC/MapR_Drill/)
 
 ----------
 
@@ -65,7 +65,7 @@ Download the installer that corresponds to the bitness of the client application
 
 ----------
 
-## Step 3: Verify the installation
+## Step 3: Verify the Installation
 
 To verify the installation on Windows 10, perform the following steps:
 
@@ -76,7 +76,7 @@ To verify the installation on Windows 10, perform the following steps:
 
 ![](http://i.imgur.com/IEN5iek.png) 
 
-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.  
+3\. Click the **Drivers** tab and verify that the **Drill ODBC Driver** appears in the list of drivers that are installed on the computer.  
 
 ![](http://i.imgur.com/xM2QXcB.png)  
 

http://git-wip-us.apache.org/repos/asf/drill/blob/2322c488/_docs/performance-tuning/query-plans-and-tuning/050-sort-based-and-hash-based-memory-constrained-operators.md
----------------------------------------------------------------------
diff --git a/_docs/performance-tuning/query-plans-and-tuning/050-sort-based-and-hash-based-memory-constrained-operators.md b/_docs/performance-tuning/query-plans-and-tuning/050-sort-based-and-hash-based-memory-constrained-operators.md
index bb62602..999e026 100644
--- a/_docs/performance-tuning/query-plans-and-tuning/050-sort-based-and-hash-based-memory-constrained-operators.md
+++ b/_docs/performance-tuning/query-plans-and-tuning/050-sort-based-and-hash-based-memory-constrained-operators.md
@@ -1,6 +1,6 @@
 ---
 title: "Sort-Based and Hash-Based Memory-Constrained Operators"
-date: 2017-08-17 22:46:43 UTC
+date: 2017-08-18 17:48:11 UTC
 parent: "Query Plans and Tuning"
 --- 
 
@@ -9,7 +9,7 @@ Drill uses hash-based and sort-based operators depending on the query characteri
 When planning a query with sort- and hash-based operations, Drill evaluates the available memory multiplied by a configurable reduction constant (for parallelization purposes) and then limits the operations to the maximum of this amount of memory. Drill spills data to disk if the sort and hash aggregate operations cannot be performed in memory. Alternatively, you can disable large hash operations if they do not fit in memory on your system. When disabled, Drill creates alternative plans. You can also modify the minimum hash table size, increasing the size for very large aggregations or joins when you have large amounts of memory for Drill to use. If you have large data sets, you can increase the hash table size to improve performance. 
 
 ##Memory Options
-The `planner.memory.max_query_memory_per_node` option sets the maximum amount of direct memory allocated to the Sort and Hash Aggregate operators during each query on a node. The default limit is set to 2147483648 bytes (2GB), which is too small for queries on large data sets and should be increased. This memory is split between operators. If a query plan contains multiple Sort and/or Hash Aggregate operators, the memory is divided between them.
+The `planner.memory.max_query_memory_per_node` option sets the maximum amount of direct memory allocated to the Sort and Hash Aggregate operators during each query on a node. The default limit is set to 2147483648 bytes (2GB), which should be increased for queries on large data sets. This memory is split between operators. If a query plan contains multiple Sort and/or Hash Aggregate operators, the memory is divided between them.
 
 When a query is parallelized, the number of operators is multiplied, which reduces the amount of memory given to each instance of the Sort and Hash Aggregate operators during a query. If you encounter memory issues when running queries with Sort and Hash Aggregate operators, calculate the memory requirements for your queries and the amount of available memory on each node. Based on the information, increase the value of the `planner.memory.max_query_memory_per_node` option using the ALTER SYSTEM|SESSION SET command, as shown:  
 


Mime
View raw message