You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ts...@apache.org on 2015/05/12 08:06:02 UTC
[16/18] drill-site git commit: Website update
http://git-wip-us.apache.org/repos/asf/drill-site/blob/01525b6b/docs/configuration-options-introduction/index.html
----------------------------------------------------------------------
diff --git a/docs/configuration-options-introduction/index.html b/docs/configuration-options-introduction/index.html
index d632e13..c6d9f7c 100644
--- a/docs/configuration-options-introduction/index.html
+++ b/docs/configuration-options-introduction/index.html
@@ -188,11 +188,11 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/getting-to-know-the-drill-sandbox/">Getting to Know the Drill Sandbox</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-1-learn-about-the-data-set/">Lession 1: Learn about the Data Set</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-1-learn-about-the-data-set/">Lesson 1: Learn about the Data Set</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-2-run-queries-with-ansi-sql/">Lession 2: Run Queries with ANSI SQL</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-2-run-queries-with-ansi-sql/">Lesson 2: Run Queries with ANSI SQL</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-3-run-queries-on-complex-data-types/">Lession 3: Run Queries on Complex Data Types</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-3-run-queries-on-complex-data-types/">Lesson 3: Run Queries on Complex Data Types</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/summary/">Summary</a></li>
@@ -401,11 +401,19 @@
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-drill/">Using MicroStrategy Analytics with Drill</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tibco-spotfire-desktop/">Using Apache Drill with Tibco Spotfire Desktop</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
</ul>
@@ -559,17 +567,17 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/alter-system-command/">ALTER SYSTEM Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/describe-command/">DESCRIBE Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN commands</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN Commands</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/select-statements/">SELECT Statements</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES AND SHOW SCHEMAS Command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES and SHOW SCHEMAS Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/show-files-command/">SHOW FILES Command</a></li>
@@ -833,401 +841,300 @@ env.sh</code> and <code>drill-override.conf</code> files. Drill stores these fil
<code>/conf</code> directory. Drill sources<code>/etc/drill/conf</code> if it exists. Otherwise,
Drill sources the local <code><drill_installation_directory>/conf</code> directory.</p>
-<p>The sys.options table in Drill contains information about boot (start-up) and system options listed in the tables on this page. </p>
-
-<h2 id="boot-options">Boot Options</h2>
-
-<p>The section, <a href="/docs/start-up-options">"Start-up Options"</a>, covers how to configure and view these options. </p>
-
-<table>
- <tr>
- <th>Name</th>
- <th>Default</th>
- <th>Comments</th>
- </tr>
- <tr>
- <td>drill.exec.buffer.impl</td>
- <td>"org.apache.drill.exec.work.batch.UnlimitedRawBatchBuffer"</td>
- <td></td>
- </tr>
- <tr>
- <td>drill.exec.buffer.size</td>
- <td>6</td>
- <td>Available memory in terms of record batches to hold data downstream of an operation. Increase this value to increase query speed.</td>
- </tr>
- <tr>
- <td>drill.exec.compile.debug</td>
- <td>TRUE</td>
- <td></td>
- </tr>
- <tr>
- <td>drill.exec.http.enabled</td>
- <td>TRUE</td>
- <td></td>
- </tr>
- <tr>
- <td>drill.exec.operator.packages</td>
- <td>"org.apache.drill.exec.physical.config"</td>
- <td></td>
- </tr>
- <tr>
- <td>drill.exec.sort.external.batch.size</td>
- <td>4000</td>
- <td></td>
- </tr>
- <tr>
- <td>drill.exec.sort.external.spill.directories</td>
- <td>"/tmp/drill/spill"</td>
- <td>Determines which directory to use for spooling</td>
- </tr>
- <tr>
- <td>drill.exec.sort.external.spill.group.size</td>
- <td>100</td>
- <td></td>
- </tr>
- <tr>
- <td>drill.exec.storage.file.text.batch.size</td>
- <td>4000</td>
- <td></td>
- </tr>
- <tr>
- <td>drill.exec.storage.packages</td>
- <td>"org.apache.drill.exec.store" "org.apache.drill.exec.store.mock"</td>
- <td>Ignore or include this module, including supplementary configuraiton information when scanning the class path scanning. This file is in [HOCON format](https://github.com/typesafehub/config/blob/master/HOCON.md).</td>
- </tr>
- <tr>
- <td>drill.exec.sys.store.provider.class</td>
- <td>ZooKeeper: "org.apache.drill.exec.store.sys.zk.ZkPStoreProvider"</td>
- <td>The Pstore (Persistent Configuration Storage) provider to use. The Pstore holds configuration and profile data.</td>
- </tr>
- <tr>
- <td>drill.exec.zk.connect</td>
- <td>"localhost:2181"</td>
- <td>The ZooKeeper quorum that Drill uses to connect to data sources. Configure on each Drillbit node.</td>
- </tr>
- <tr>
- <td>drill.exec.zk.refresh</td>
- <td>500</td>
- <td></td>
- </tr>
- <tr>
- <td>file.separator</td>
- <td>"/"</td>
- <td></td>
- </tr>
- <tr>
- <td>java.specification.version</td>
- <td>1.7</td>
- <td></td>
- </tr>
- <tr>
- <td>java.vm.name</td>
- <td>"Java HotSpot(TM) 64-Bit Server VM"</td>
- <td></td>
- </tr>
- <tr>
- <td>java.vm.specification.version</td>
- <td>1.7</td>
- <td></td>
- </tr>
- <tr>
- <td>log.path</td>
- <td>"/log/sqlline.log"</td>
- <td></td>
- </tr>
- <tr>
- <td>sun.boot.library.path</td>
- <td>/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home/jre/lib</td>
- <td></td>
- </tr>
- <tr>
- <td>sun.java.command</td>
- <td>"sqlline.SqlLine -d org.apache.drill.jdbc.Driver --maxWidth=10000 -u jdbc:drill:zk=local"</td>
- <td></td>
- </tr>
- <tr>
- <td>sun.os.patch.level</td>
- <td>unknown</td>
- <td></td>
- </tr>
- <tr>
- <td>user</td>
- <td>""</td>
- <td></td>
- </tr>
-</table>
+<p>The sys.options table in Drill contains information about boot (start-up) and system options. The section, <a href="/docs/start-up-options">"Start-up Options"</a>, covers how to configure and view key boot options. The sys.options table also contains many system options, some of which are described in detail the section, <a href="/docs/planning-and-execution-options">"Planning and Execution Options"</a>. The following table lists the options in alphabetical order and provides a brief description of supported options:</p>
<h2 id="system-options">System Options</h2>
<p>The sys.options table lists the following options that you can set at the session or system level as described in the section, <a href="/docs/planning-and-execution-options">"Planning and Execution Options"</a> </p>
-<table>
- <tr>
- <th>Name</th>
- <th>Default</th>
- <th>Comments</th>
- </tr>
- <tr>
- <td>drill.exec.functions.cast_empty_string_to_null</td>
- <td>FALSE</td>
- <td></td>
- </tr>
- <tr>
- <td>drill.exec.storage.file.partition.column.label</td>
- <td>dir</td>
- <td>Accepts a string input.</td>
- </tr>
- <tr>
- <td>exec.errors.verbose</td>
- <td>FALSE</td>
- <td>Toggles verbose output of executable error messages</td>
- </tr>
- <tr>
- <td>exec.java_compiler</td>
- <td>DEFAULT</td>
- <td>Switches between DEFAULT, JDK, and JANINO mode for the current session. Uses Janino by default for generated source code of less than exec.java_compiler_janino_maxsize; otherwise, switches to the JDK compiler.</td>
- </tr>
- <tr>
- <td>exec.java_compiler_debug</td>
- <td>TRUE</td>
- <td>Toggles the output of debug-level compiler error messages in runtime generated code.</td>
- </tr>
- <tr>
- <td>exec.java_compiler_janino_maxsize</td>
- <td>262144</td>
- <td>See the exec.java_compiler option comment. Accepts inputs of type LONG.</td>
- </tr>
- <tr>
- <td>exec.max_hash_table_size</td>
- <td>1073741824</td>
- <td>Ending size for hash tables. Range: 0 - 1073741824</td>
- </tr>
- <tr>
- <td>exec.min_hash_table_size</td>
- <td>65536</td>
- <td>Starting size for hash tables. Increase according to available memory to improve performance. Range: 0 - 1073741824</td>
- </tr>
- <tr>
- <td>exec.queue.enable</td>
- <td>FALSE</td>
- <td>Changes the state of query queues to control the number of queries that run simultaneously.</td>
- </tr>
- <tr>
- <td>exec.queue.large</td>
- <td>10</td>
- <td>Range: 0-1000</td>
- </tr>
- <tr>
- <td>exec.queue.small</td>
- <td>100</td>
- <td>Range: 0-1001</td>
- </tr>
- <tr>
- <td>exec.queue.threshold</td>
- <td>30000000</td>
- <td>Range: 0-9223372036854775807</td>
- </tr>
- <tr>
- <td>exec.queue.timeout_millis</td>
- <td>300000</td>
- <td>Range: 0-9223372036854775807</td>
- </tr>
- <tr>
- <td>planner.add_producer_consumer</td>
- <td>FALSE</td>
- <td>Increase prefetching of data from disk. Disable for in-memory reads.</td>
- </tr>
- <tr>
- <td>planner.affinity_factor</td>
- <td>1.2</td>
- <td>Accepts inputs of type DOUBLE.</td>
- </tr>
- <tr>
- <td>planner.broadcast_factor</td>
- <td>1</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.broadcast_threshold</td>
- <td>10000000</td>
- <td>Threshold in number of rows that triggers a broadcast join for a query if the right side of the join contains fewer rows than the threshold. Avoids broadcasting too many rows to join. Range: 0-2147483647</td>
- </tr>
- <tr>
- <td>planner.disable_exchanges</td>
- <td>FALSE</td>
- <td>Toggles the state of hashing to a random exchange.</td>
- </tr>
- <tr>
- <td>planner.enable_broadcast_join</td>
- <td>TRUE</td>
- <td>Changes the state of aggregation and join operators. Do not disable.</td>
- </tr>
- <tr>
- <td>planner.enable_demux_exchange</td>
- <td>FALSE</td>
- <td>Toggles the state of hashing to a demulitplexed exchange.</td>
- </tr>
- <tr>
- <td>planner.enable_hash_single_key</td>
- <td>TRUE</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.enable_hashagg</td>
- <td>TRUE</td>
- <td>Enable hash aggregation; otherwise, Drill does a sort-based aggregation. Does not write to disk. Enable is recommended.</td>
- </tr>
- <tr>
- <td>planner.enable_hashjoin</td>
- <td>TRUE</td>
- <td>Enable the memory hungry hash join. Does not write to disk.</td>
- </tr>
- <tr>
- <td>planner.enable_hashjoin_swap</td>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td>planner.enable_mergejoin</td>
- <td>TRUE</td>
- <td>Sort-based operation. Writes to disk.</td>
- </tr>
- <tr>
- <td>planner.enable_multiphase_agg</td>
- <td>TRUE</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.enable_mux_exchange</td>
- <td>TRUE</td>
- <td>Toggles the state of hashing to a multiplexed exchange.</td>
- </tr>
- <tr>
- <td>planner.enable_streamagg</td>
- <td>TRUE</td>
- <td>Sort-based operation. Writes to disk.</td>
- </tr>
- <tr>
- <td>planner.identifier_max_length</td>
- <td>1024</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.join.hash_join_swap_margin_factor</td>
- <td>10</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.join.row_count_estimate_factor</td>
- <td>1</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.memory.average_field_width</td>
- <td>8</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.memory.enable_memory_estimation</td>
- <td>FALSE</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.memory.hash_agg_table_factor</td>
- <td>1.1</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.memory.hash_join_table_factor</td>
- <td>1.1</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.memory.max_query_memory_per_node</td>
- <td>2147483648</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.memory.non_blocking_operators_memory</td>
- <td>64</td>
- <td>Range: 0-2048</td>
- </tr>
- <tr>
- <td>planner.partitioner_sender_max_threads</td>
- <td>8</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.partitioner_sender_set_threads</td>
- <td>-1</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.partitioner_sender_threads_factor</td>
- <td>1</td>
- <td></td>
- </tr>
- <tr>
- <td>planner.producer_consumer_queue_size</td>
- <td>10</td>
- <td>How much data to prefetch from disk (in record batches) out of band of query execution</td>
- </tr>
- <tr>
- <td>planner.slice_target</td>
- <td>100000</td>
- <td>The number of records manipulated within a fragment before Drill parallelizes operations.</td>
- </tr>
- <tr>
- <td>planner.width.max_per_node</td>
- <td>3</td>
- <td>The maximum degree of distribution of a query across cores and cluster nodes.</td>
- </tr>
- <tr>
- <td>planner.width.max_per_query</td>
- <td>1000</td>
- <td>Same as max per node but applies to the query as executed by the entire cluster.</td>
- </tr>
- <tr>
- <td>store.format</td>
- <td>parquet</td>
- <td>Output format for data written to tables with the CREATE TABLE AS (CTAS) command. Allowed values are parquet, json, or text. Allowed values: 0, -1, 1000000</td>
- </tr>
- <tr>
- <td>store.json.all_text_mode</a></td>
- <td>FALSE</td>
- <td>Drill reads all data from the JSON files as VARCHAR. Prevents schema change errors.</td>
- </tr>
- <tr>
- <td>store.mongo.all_text_mode</td>
- <td>FALSE</td>
- <td>Similar to store.json.all_text_mode for MongoDB.</td>
- </tr>
- <tr>
- <td>store.parquet.block-size</a></td>
- <td>536870912</td>
- <td>Sets the size of a Parquet row group to the number of bytes less than or equal to the block size of MFS, HDFS, or the file system.</td>
- </tr>
- <tr>
- <td>store.parquet.compression</td>
- <td>snappy</td>
- <td>Compression type for storing Parquet output. Allowed values: snappy, gzip, none</td>
- </tr>
- <tr>
- <td>store.parquet.enable_dictionary_encoding*</td>
- <td>FALSE</td>
- <td>Do not change.</td>
- </tr>
- <tr>
- <td>store.parquet.use_new_reader</td>
- <td>FALSE</td>
- <td>Not supported</td>
- </tr>
- <tr>
- <td>window.enable*</td>
- <td>FALSE</td>
- <td>Coming soon.</td>
- </tr>
-</table>
+<table><thead>
+<tr>
+<th>Name</th>
+<th>Default</th>
+<th>Comments</th>
+</tr>
+</thead><tbody>
+<tr>
+<td>drill.exec.functions.cast_empty_string_to_null</td>
+<td>FALSE</td>
+<td>Not supported in this release.</td>
+</tr>
+<tr>
+<td>drill.exec.storage.file.partition.column.label</td>
+<td>dir</td>
+<td>Accepts a string input.</td>
+</tr>
+<tr>
+<td>exec.errors.verbose</td>
+<td>FALSE</td>
+<td>Toggles verbose output of executable error messages</td>
+</tr>
+<tr>
+<td>exec.java_compiler</td>
+<td>DEFAULT</td>
+<td>Switches between DEFAULT, JDK, and JANINO mode for the current session. Uses Janino by default for generated source code of less than exec.java_compiler_janino_maxsize; otherwise, switches to the JDK compiler.</td>
+</tr>
+<tr>
+<td>exec.java_compiler_debug</td>
+<td>TRUE</td>
+<td>Toggles the output of debug-level compiler error messages in runtime generated code.</td>
+</tr>
+<tr>
+<td>exec.java_compiler_janino_maxsize</td>
+<td>262144</td>
+<td>See the exec.java_compiler option comment. Accepts inputs of type LONG.</td>
+</tr>
+<tr>
+<td>exec.max_hash_table_size</td>
+<td>1073741824</td>
+<td>Ending size for hash tables. Range: 0 - 1073741824</td>
+</tr>
+<tr>
+<td>exec.min_hash_table_size</td>
+<td>65536</td>
+<td>Starting size for hash tables. Increase according to available memory to improve performance. Range: 0 - 1073741824</td>
+</tr>
+<tr>
+<td>exec.queue.enable</td>
+<td>FALSE</td>
+<td>Changes the state of query queues to control the number of queries that run simultaneously.</td>
+</tr>
+<tr>
+<td>exec.queue.large</td>
+<td>10</td>
+<td>Sets the number of large queries that can run concurrently in the cluster. Range: 0-1000</td>
+</tr>
+<tr>
+<td>exec.queue.small</td>
+<td>100</td>
+<td>Sets the number of small queries that can run concurrently in the cluster. Range: 0-1001</td>
+</tr>
+<tr>
+<td>exec.queue.threshold</td>
+<td>30000000</td>
+<td>Sets the cost threshold, which depends on the complexity of the queries in queue, for determining whether query is large or small. Complex queries have higher thresholds. Range: 0-9223372036854775807</td>
+</tr>
+<tr>
+<td>exec.queue.timeout_millis</td>
+<td>300000</td>
+<td>Indicates how long a query can wait in queue before the query fails. Range: 0-9223372036854775807</td>
+</tr>
+<tr>
+<td>planner.add_producer_consumer</td>
+<td>FALSE</td>
+<td>Increase prefetching of data from disk. Disable for in-memory reads.</td>
+</tr>
+<tr>
+<td>planner.affinity_factor</td>
+<td>1.2</td>
+<td>Accepts inputs of type DOUBLE.</td>
+</tr>
+<tr>
+<td>planner.broadcast_factor</td>
+<td>1</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.broadcast_threshold</td>
+<td>10000000</td>
+<td>The maximum number of records allowed to be broadcast as part of a query. After one million records, Drill reshuffles data rather than doing a broadcast to one side of the join. Range: 0-2147483647</td>
+</tr>
+<tr>
+<td>planner.disable_exchanges</td>
+<td>FALSE</td>
+<td>Toggles the state of hashing to a random exchange.</td>
+</tr>
+<tr>
+<td>planner.enable_broadcast_join</td>
+<td>TRUE</td>
+<td>Changes the state of aggregation and join operators. The broadcast join can be used for hash join, merge join and nested loop join. Use to join a large (fact) table to relatively smaller (dimension) tables. Do not disable.</td>
+</tr>
+<tr>
+<td>planner.enable_constant_folding</td>
+<td>TRUE</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.enable_demux_exchange</td>
+<td>FALSE</td>
+<td>Toggles the state of hashing to a demulitplexed exchange.</td>
+</tr>
+<tr>
+<td>planner.enable_hash_single_key</td>
+<td>TRUE</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.enable_hashagg</td>
+<td>TRUE</td>
+<td>Enable hash aggregation; otherwise, Drill does a sort-based aggregation. Does not write to disk. Enable is recommended.</td>
+</tr>
+<tr>
+<td>planner.enable_hashjoin</td>
+<td>TRUE</td>
+<td>Enable the memory hungry hash join. Drill assumes that a query with have adequate memory to complete and tries to use the fastest operations possible to complete the planned inner, left, right, or full outer joins using a hash table. Does not write to disk. Disabling hash join allows Drill to manage arbitrarily large data in a small memory footprint.</td>
+</tr>
+<tr>
+<td>planner.enable_hashjoin_swap</td>
+<td>TRUE</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.enable_mergejoin</td>
+<td>TRUE</td>
+<td>Sort-based operation. A merge join is used for inner join, left and right outer joins. Inputs to the merge join must be sorted. It reads the sorted input streams from both sides and finds matching rows. Writes to disk.</td>
+</tr>
+<tr>
+<td>planner.enable_multiphase_agg</td>
+<td>TRUE</td>
+<td>Each minor fragment does a local aggregation in phase 1, distributes on a hash basis using GROUP-BY keys partially aggregated results to other fragments, and all the fragments perform a total aggregation using this data.</td>
+</tr>
+<tr>
+<td>planner.enable_mux_exchange</td>
+<td>TRUE</td>
+<td>Toggles the state of hashing to a multiplexed exchange.</td>
+</tr>
+<tr>
+<td>planner.enable_nestedloopjoin</td>
+<td>TRUE</td>
+<td>Sort-based operation. Writes to disk.</td>
+</tr>
+<tr>
+<td>planner.enable_nljoin_for_scalar_only</td>
+<td>TRUE</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.enable_streamagg</td>
+<td>TRUE</td>
+<td>Sort-based operation. Writes to disk.</td>
+</tr>
+<tr>
+<td>planner.identifier_max_length</td>
+<td>1024</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.join.hash_join_swap_margin_factor</td>
+<td>10</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.join.row_count_estimate_factor</td>
+<td>1</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.memory.average_field_width</td>
+<td>8</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.memory.enable_memory_estimation</td>
+<td>FALSE</td>
+<td>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.</td>
+</tr>
+<tr>
+<td>planner.memory.hash_agg_table_factor</td>
+<td>1.1</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.memory.hash_join_table_factor</td>
+<td>1.1</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.memory.max_query_memory_per_node</td>
+<td>2147483648</td>
+<td>Sets the maximum estimate of memory for a query per node. If the estimate is too low, Drill re-plans the query without memory-constrained operators.</td>
+</tr>
+<tr>
+<td>planner.memory.non_blocking_operators_memory</td>
+<td>64</td>
+<td>Range: 0-2048</td>
+</tr>
+<tr>
+<td>planner.nestedloopjoin_factor</td>
+<td>100</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.partitioner_sender_max_threads</td>
+<td>8</td>
+<td>Upper limit of threads for outbound queuing.</td>
+</tr>
+<tr>
+<td>planner.partitioner_sender_set_threads</td>
+<td>-1</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.partitioner_sender_threads_factor</td>
+<td>1</td>
+<td></td>
+</tr>
+<tr>
+<td>planner.producer_consumer_queue_size</td>
+<td>10</td>
+<td>How much data to prefetch from disk (in record batches) out of band of query execution</td>
+</tr>
+<tr>
+<td>planner.slice_target</td>
+<td>100000</td>
+<td>The number of records manipulated within a fragment before Drill parallelizes operations.</td>
+</tr>
+<tr>
+<td>planner.width.max_per_node</td>
+<td>3</td>
+<td>Maximum number of threads that can run in parallel for a query on a node. A slice is an individual thread. This number indicates the maximum number of slices per query for the query’s major fragment on a node.</td>
+</tr>
+<tr>
+<td>planner.width.max_per_query</td>
+<td>1000</td>
+<td>Same as max per node but applies to the query as executed by the entire cluster.</td>
+</tr>
+<tr>
+<td>store.format</td>
+<td>parquet</td>
+<td>Output format for data written to tables with the CREATE TABLE AS (CTAS) command. Allowed values are parquet, json, or text. Allowed values: 0, -1, 1000000</td>
+</tr>
+<tr>
+<td>store.json.all_text_mode</td>
+<td>FALSE</td>
+<td>Drill reads all data from the JSON files as VARCHAR. Prevents schema change errors.</td>
+</tr>
+<tr>
+<td>store.mongo.all_text_mode</td>
+<td>FALSE</td>
+<td>Similar to store.json.all_text_mode for MongoDB.</td>
+</tr>
+<tr>
+<td>store.parquet.block-size</td>
+<td>536870912</td>
+<td>Sets the size of a Parquet row group to the number of bytes less than or equal to the block size of MFS, HDFS, or the file system.</td>
+</tr>
+<tr>
+<td>store.parquet.compression</td>
+<td>snappy</td>
+<td>Compression type for storing Parquet output. Allowed values: snappy, gzip, none</td>
+</tr>
+<tr>
+<td>store.parquet.enable_dictionary_encoding*</td>
+<td>FALSE</td>
+<td>Do not change.</td>
+</tr>
+<tr>
+<td>store.parquet.use_new_reader</td>
+<td>FALSE</td>
+<td>Not supported</td>
+</tr>
+<tr>
+<td>window.enable*</td>
+<td>FALSE</td>
+<td>Coming soon.</td>
+</tr>
+</tbody></table>
<p>* Not supported in this release.</p>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/01525b6b/docs/configuration-options/index.html
----------------------------------------------------------------------
diff --git a/docs/configuration-options/index.html b/docs/configuration-options/index.html
index ce62c29..18436a0 100644
--- a/docs/configuration-options/index.html
+++ b/docs/configuration-options/index.html
@@ -188,11 +188,11 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/getting-to-know-the-drill-sandbox/">Getting to Know the Drill Sandbox</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-1-learn-about-the-data-set/">Lession 1: Learn about the Data Set</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-1-learn-about-the-data-set/">Lesson 1: Learn about the Data Set</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-2-run-queries-with-ansi-sql/">Lession 2: Run Queries with ANSI SQL</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-2-run-queries-with-ansi-sql/">Lesson 2: Run Queries with ANSI SQL</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-3-run-queries-on-complex-data-types/">Lession 3: Run Queries on Complex Data Types</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-3-run-queries-on-complex-data-types/">Lesson 3: Run Queries on Complex Data Types</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/summary/">Summary</a></li>
@@ -401,11 +401,19 @@
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-drill/">Using MicroStrategy Analytics with Drill</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tibco-spotfire-desktop/">Using Apache Drill with Tibco Spotfire Desktop</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
</ul>
@@ -559,17 +567,17 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/alter-system-command/">ALTER SYSTEM Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/describe-command/">DESCRIBE Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN commands</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN Commands</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/select-statements/">SELECT Statements</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES AND SHOW SCHEMAS Command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES and SHOW SCHEMAS Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/show-files-command/">SHOW FILES Command</a></li>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/01525b6b/docs/configure-drill-introduction/index.html
----------------------------------------------------------------------
diff --git a/docs/configure-drill-introduction/index.html b/docs/configure-drill-introduction/index.html
index 7100d4a..980b23c 100644
--- a/docs/configure-drill-introduction/index.html
+++ b/docs/configure-drill-introduction/index.html
@@ -188,11 +188,11 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/getting-to-know-the-drill-sandbox/">Getting to Know the Drill Sandbox</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-1-learn-about-the-data-set/">Lession 1: Learn about the Data Set</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-1-learn-about-the-data-set/">Lesson 1: Learn about the Data Set</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-2-run-queries-with-ansi-sql/">Lession 2: Run Queries with ANSI SQL</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-2-run-queries-with-ansi-sql/">Lesson 2: Run Queries with ANSI SQL</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-3-run-queries-on-complex-data-types/">Lession 3: Run Queries on Complex Data Types</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-3-run-queries-on-complex-data-types/">Lesson 3: Run Queries on Complex Data Types</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/summary/">Summary</a></li>
@@ -401,11 +401,19 @@
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-drill/">Using MicroStrategy Analytics with Drill</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tibco-spotfire-desktop/">Using Apache Drill with Tibco Spotfire Desktop</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
</ul>
@@ -559,17 +567,17 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/alter-system-command/">ALTER SYSTEM Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/describe-command/">DESCRIBE Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN commands</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN Commands</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/select-statements/">SELECT Statements</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES AND SHOW SCHEMAS Command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES and SHOW SCHEMAS Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/show-files-command/">SHOW FILES Command</a></li>
@@ -824,9 +832,12 @@
<div class="int_text" align="left">
- <p>When using Drill, you need to make sufficient memory available Drill and other workloads running on the cluster. You might want to modify options for performance or functionality. For example, the default storage format for CTAS
-statements is Parquet. Using a configuration option, you can modify the default setting so that output data
-is stored in CSV or JSON format. The section covers the many options you can configure and how to configure memory resources for Drill running along side other workloads. This section also includes ports used by Drill.</p>
+ <p>When using Drill, you need to make sufficient memory available Drill when running Drill alone or along side other workloads on the cluster. The next section, <a href="/docs/configuring-drill-memory">"Configuring Drill Memory"</a> describes how to configure memory for a Drill cluster. Configuring other resources for <a href="/docs/configuring-multitenant-resources">multitenancy clusters</a> or for <a href="/docs/configuring-a-shared-drillbit">sharing a Drillbit</a> on a cluster is covered later.</p>
+
+<p>You can also modify options for performance or functionality. For example, changing the default storage format is a typical functional change. The default storage format for CTAS
+statements is Parquet. Using a configuration option, you can modify Drill to store the output data in CSV or JSON format. </p>
+
+<p>The section, <a href="/docs/configuration-options-introduction">"Configuration Options Introduction"</a> summarizes the many options you can configure. </p>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/01525b6b/docs/configure-drill/index.html
----------------------------------------------------------------------
diff --git a/docs/configure-drill/index.html b/docs/configure-drill/index.html
index 2879674..4076e7e 100644
--- a/docs/configure-drill/index.html
+++ b/docs/configure-drill/index.html
@@ -188,11 +188,11 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/getting-to-know-the-drill-sandbox/">Getting to Know the Drill Sandbox</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-1-learn-about-the-data-set/">Lession 1: Learn about the Data Set</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-1-learn-about-the-data-set/">Lesson 1: Learn about the Data Set</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-2-run-queries-with-ansi-sql/">Lession 2: Run Queries with ANSI SQL</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-2-run-queries-with-ansi-sql/">Lesson 2: Run Queries with ANSI SQL</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-3-run-queries-on-complex-data-types/">Lession 3: Run Queries on Complex Data Types</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-3-run-queries-on-complex-data-types/">Lesson 3: Run Queries on Complex Data Types</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/summary/">Summary</a></li>
@@ -401,11 +401,19 @@
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-drill/">Using MicroStrategy Analytics with Drill</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tibco-spotfire-desktop/">Using Apache Drill with Tibco Spotfire Desktop</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
</ul>
@@ -559,17 +567,17 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/alter-system-command/">ALTER SYSTEM Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/describe-command/">DESCRIBE Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN commands</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN Commands</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/select-statements/">SELECT Statements</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES AND SHOW SCHEMAS Command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES and SHOW SCHEMAS Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/show-files-command/">SHOW FILES Command</a></li>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/01525b6b/docs/configuring-a-multitenant-cluster-introduction/index.html
----------------------------------------------------------------------
diff --git a/docs/configuring-a-multitenant-cluster-introduction/index.html b/docs/configuring-a-multitenant-cluster-introduction/index.html
index ed62a57..b74a7cd 100644
--- a/docs/configuring-a-multitenant-cluster-introduction/index.html
+++ b/docs/configuring-a-multitenant-cluster-introduction/index.html
@@ -188,11 +188,11 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/getting-to-know-the-drill-sandbox/">Getting to Know the Drill Sandbox</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-1-learn-about-the-data-set/">Lession 1: Learn about the Data Set</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-1-learn-about-the-data-set/">Lesson 1: Learn about the Data Set</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-2-run-queries-with-ansi-sql/">Lession 2: Run Queries with ANSI SQL</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-2-run-queries-with-ansi-sql/">Lesson 2: Run Queries with ANSI SQL</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-3-run-queries-on-complex-data-types/">Lession 3: Run Queries on Complex Data Types</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-3-run-queries-on-complex-data-types/">Lesson 3: Run Queries on Complex Data Types</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/summary/">Summary</a></li>
@@ -401,11 +401,19 @@
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-drill/">Using MicroStrategy Analytics with Drill</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tibco-spotfire-desktop/">Using Apache Drill with Tibco Spotfire Desktop</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
</ul>
@@ -559,17 +567,17 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/alter-system-command/">ALTER SYSTEM Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/describe-command/">DESCRIBE Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN commands</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN Commands</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/select-statements/">SELECT Statements</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES AND SHOW SCHEMAS Command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES and SHOW SCHEMAS Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/show-files-command/">SHOW FILES Command</a></li>
@@ -826,9 +834,7 @@
<div class="int_text" align="left">
- <p>Drill supports multiple users sharing a Drillbit. You can also run separate Drillbits running on different nodes in the cluster.</p>
-
-<p>Drill typically runs along side other workloads, including the following: </p>
+ <p>Drill supports multiple users sharing a Drillbit and running separate Drillbits on different nodes in the cluster. Drill typically runs along side other workloads, including the following: </p>
<ul>
<li>Mapreduce<br></li>
@@ -838,7 +844,7 @@
<li>Spark<br></li>
</ul>
-<p>You need to plan and configure these resources for use with Drill and other workloads: </p>
+<p>You need to plan and configure the following resources for use with Drill and other workloads: </p>
<ul>
<li><a href="/docs/configuring-multitenant-resources">Memory</a><br></li>
@@ -846,7 +852,7 @@
<li>Disk<br></li>
</ul>
-<p>Configure, memory, queues, and parallelization when users <a href="/docs/configuring-resources-for-a-shared-drillbit">share a Drillbit</a>.</p>
+<p>When users share a Drillbit, <a href="/docs/configuring-resources-for-a-shared-drillbit#configuring-query-queuing">configure queues</a> and <a href="/docs/configuring-resources-for-a-shared-drillbit#configuring-parallelization">parallelization</a> in addition to memory.</p>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/01525b6b/docs/configuring-a-multitenant-cluster/index.html
----------------------------------------------------------------------
diff --git a/docs/configuring-a-multitenant-cluster/index.html b/docs/configuring-a-multitenant-cluster/index.html
index 593f21e..d1bcab3 100644
--- a/docs/configuring-a-multitenant-cluster/index.html
+++ b/docs/configuring-a-multitenant-cluster/index.html
@@ -188,11 +188,11 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/getting-to-know-the-drill-sandbox/">Getting to Know the Drill Sandbox</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-1-learn-about-the-data-set/">Lession 1: Learn about the Data Set</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-1-learn-about-the-data-set/">Lesson 1: Learn about the Data Set</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-2-run-queries-with-ansi-sql/">Lession 2: Run Queries with ANSI SQL</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-2-run-queries-with-ansi-sql/">Lesson 2: Run Queries with ANSI SQL</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-3-run-queries-on-complex-data-types/">Lession 3: Run Queries on Complex Data Types</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-3-run-queries-on-complex-data-types/">Lesson 3: Run Queries on Complex Data Types</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/summary/">Summary</a></li>
@@ -401,11 +401,19 @@
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-drill/">Using MicroStrategy Analytics with Drill</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tibco-spotfire-desktop/">Using Apache Drill with Tibco Spotfire Desktop</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
</ul>
@@ -559,17 +567,17 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/alter-system-command/">ALTER SYSTEM Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/describe-command/">DESCRIBE Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN commands</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN Commands</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/select-statements/">SELECT Statements</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES AND SHOW SCHEMAS Command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES and SHOW SCHEMAS Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/show-files-command/">SHOW FILES Command</a></li>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/01525b6b/docs/configuring-connections-on-linux-and-mac-os-x/index.html
----------------------------------------------------------------------
diff --git a/docs/configuring-connections-on-linux-and-mac-os-x/index.html b/docs/configuring-connections-on-linux-and-mac-os-x/index.html
index fe76284..24d295f 100644
--- a/docs/configuring-connections-on-linux-and-mac-os-x/index.html
+++ b/docs/configuring-connections-on-linux-and-mac-os-x/index.html
@@ -188,11 +188,11 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/getting-to-know-the-drill-sandbox/">Getting to Know the Drill Sandbox</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-1-learn-about-the-data-set/">Lession 1: Learn about the Data Set</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-1-learn-about-the-data-set/">Lesson 1: Learn about the Data Set</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-2-run-queries-with-ansi-sql/">Lession 2: Run Queries with ANSI SQL</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-2-run-queries-with-ansi-sql/">Lesson 2: Run Queries with ANSI SQL</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-3-run-queries-on-complex-data-types/">Lession 3: Run Queries on Complex Data Types</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-3-run-queries-on-complex-data-types/">Lesson 3: Run Queries on Complex Data Types</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/summary/">Summary</a></li>
@@ -401,11 +401,19 @@
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-drill/">Using MicroStrategy Analytics with Drill</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tibco-spotfire-desktop/">Using Apache Drill with Tibco Spotfire Desktop</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
</ul>
@@ -559,17 +567,17 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/alter-system-command/">ALTER SYSTEM Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/describe-command/">DESCRIBE Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN commands</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN Commands</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/select-statements/">SELECT Statements</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES AND SHOW SCHEMAS Command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES and SHOW SCHEMAS Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/show-files-command/">SHOW FILES Command</a></li>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/01525b6b/docs/configuring-connections-on-windows/index.html
----------------------------------------------------------------------
diff --git a/docs/configuring-connections-on-windows/index.html b/docs/configuring-connections-on-windows/index.html
index dc2c8c3..d4ddb08 100644
--- a/docs/configuring-connections-on-windows/index.html
+++ b/docs/configuring-connections-on-windows/index.html
@@ -188,11 +188,11 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/getting-to-know-the-drill-sandbox/">Getting to Know the Drill Sandbox</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-1-learn-about-the-data-set/">Lession 1: Learn about the Data Set</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-1-learn-about-the-data-set/">Lesson 1: Learn about the Data Set</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-2-run-queries-with-ansi-sql/">Lession 2: Run Queries with ANSI SQL</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-2-run-queries-with-ansi-sql/">Lesson 2: Run Queries with ANSI SQL</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-3-run-queries-on-complex-data-types/">Lession 3: Run Queries on Complex Data Types</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-3-run-queries-on-complex-data-types/">Lesson 3: Run Queries on Complex Data Types</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/summary/">Summary</a></li>
@@ -401,11 +401,19 @@
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-drill/">Using MicroStrategy Analytics with Drill</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tibco-spotfire-desktop/">Using Apache Drill with Tibco Spotfire Desktop</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
</ul>
@@ -559,17 +567,17 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/alter-system-command/">ALTER SYSTEM Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/describe-command/">DESCRIBE Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN commands</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN Commands</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/select-statements/">SELECT Statements</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES AND SHOW SCHEMAS Command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES and SHOW SCHEMAS Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/show-files-command/">SHOW FILES Command</a></li>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/01525b6b/docs/configuring-drill-memory/index.html
----------------------------------------------------------------------
diff --git a/docs/configuring-drill-memory/index.html b/docs/configuring-drill-memory/index.html
index a1095db..973b145 100644
--- a/docs/configuring-drill-memory/index.html
+++ b/docs/configuring-drill-memory/index.html
@@ -188,11 +188,11 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/getting-to-know-the-drill-sandbox/">Getting to Know the Drill Sandbox</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-1-learn-about-the-data-set/">Lession 1: Learn about the Data Set</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-1-learn-about-the-data-set/">Lesson 1: Learn about the Data Set</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-2-run-queries-with-ansi-sql/">Lession 2: Run Queries with ANSI SQL</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-2-run-queries-with-ansi-sql/">Lesson 2: Run Queries with ANSI SQL</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-3-run-queries-on-complex-data-types/">Lession 3: Run Queries on Complex Data Types</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-3-run-queries-on-complex-data-types/">Lesson 3: Run Queries on Complex Data Types</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/summary/">Summary</a></li>
@@ -401,11 +401,19 @@
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-drill/">Using MicroStrategy Analytics with Drill</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tibco-spotfire-desktop/">Using Apache Drill with Tibco Spotfire Desktop</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
</ul>
@@ -559,17 +567,17 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/alter-system-command/">ALTER SYSTEM Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/describe-command/">DESCRIBE Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN commands</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN Commands</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/select-statements/">SELECT Statements</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES AND SHOW SCHEMAS Command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES and SHOW SCHEMAS Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/show-files-command/">SHOW FILES Command</a></li>
@@ -856,7 +864,12 @@ DRILL_MAX_HEAP="4G"
export DRILL_JAVA_OPTS="-Xms1G -Xmx$DRILL_MAX_HEAP -XX:MaxDirectMemorySize=$DRILL_MAX_DIRECT_MEMORY -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=1G -ea"
</code></pre></div>
-<p>The DRILL_MAX_DIRECT_MEMORY is the Java direct memory. The DRILL_MAX_HEAP is the maximum theoretical heap limit for the JVM. Xmx specifies the maximum memory allocation pool for a Java Virtual Machine (JVM). Xms specifies the initial memory allocation pool.</p>
+<ul>
+<li>DRILL_MAX_DIRECT_MEMORY is the Java direct memory. </li>
+<li>DRILL_MAX_HEAP is the maximum theoretical heap limit for the JVM. </li>
+<li>Xmx specifies the maximum memory allocation pool for a Java Virtual Machine (JVM). </li>
+<li>Xms specifies the initial memory allocation pool.</li>
+</ul>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/01525b6b/docs/configuring-multitenant-resources/index.html
----------------------------------------------------------------------
diff --git a/docs/configuring-multitenant-resources/index.html b/docs/configuring-multitenant-resources/index.html
index cdd66b9..7c15255 100644
--- a/docs/configuring-multitenant-resources/index.html
+++ b/docs/configuring-multitenant-resources/index.html
@@ -188,11 +188,11 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/getting-to-know-the-drill-sandbox/">Getting to Know the Drill Sandbox</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-1-learn-about-the-data-set/">Lession 1: Learn about the Data Set</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-1-learn-about-the-data-set/">Lesson 1: Learn about the Data Set</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-2-run-queries-with-ansi-sql/">Lession 2: Run Queries with ANSI SQL</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-2-run-queries-with-ansi-sql/">Lesson 2: Run Queries with ANSI SQL</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-3-run-queries-on-complex-data-types/">Lession 3: Run Queries on Complex Data Types</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-3-run-queries-on-complex-data-types/">Lesson 3: Run Queries on Complex Data Types</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/summary/">Summary</a></li>
@@ -401,11 +401,19 @@
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-drill/">Using MicroStrategy Analytics with Drill</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tibco-spotfire-desktop/">Using Apache Drill with Tibco Spotfire Desktop</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
</ul>
@@ -559,17 +567,17 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/alter-system-command/">ALTER SYSTEM Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/describe-command/">DESCRIBE Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN commands</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN Commands</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/select-statements/">SELECT Statements</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES AND SHOW SCHEMAS Command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES and SHOW SCHEMAS Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/show-files-command/">SHOW FILES Command</a></li>
@@ -826,47 +834,11 @@
<div class="int_text" align="left">
- <p>Drill operations are memory and CPU-intensive. Currently, Drill resources are managed outside MapR Warden service in terms of configuring the resources as well as enforcing the resource usage within the limit. Configure memory for Drill in a multitenant by modifying drill-env.sh. <Add detail on property names etc></p>
-
-<ol>
-<li>To ensure Warden account for resources required for Drill, make sure the following properties are set appropriately in warden.drill-bits.conf. For reference on the meaning of the properties refer to the following MapR doc <add link></li>
-</ol>
-
-<p>service.heapsize.min
-service.heapsize.max
-service.heapsize.percent</p>
-
-<p>The percent should always be considered as the one to change, it is more intuitive to understand and grows/shrinks according to different node's configuration. </p>
-
-<p>It will be good if someone in Drill QA could try it out and see if it fits Drill's needs. </p>
-
-<p>Note that these properties should be set in addition to configuring the resources the in drill-env.conf even if you didnt change the defaults in drill-env.sh. Setting up memory limit in drill-env.sh tells Drill how much resources to use during query execution and setting up these warden-drill-bits.conf tells warden not to commit these resources to some other process. In near future, we expect to provide a more deeper integration on these settings
-<give an example></p>
-
-<ol>
-<li>This configuration is same whether you use Drill is enabled cluster or non-YARN cluster.</li>
-</ol>
+ <p>Drill operations are memory and CPU-intensive. Currently, Drill resources are managed outside of any cluster management service. In a multitenant or any other type of cluster, YARN-enabled or not, you configure memory and memory usage limits for Drill by modifying the <code>drill-env.sh</code> file as described in <a href="/docs/configuring-drill-memory">"Configuring Drill Memory"</a>.</p>
-<p>You need to statically partition the cluster to designate which partition handles which workload. To configure resources for Drill in a MapR cluster, modify one or more of the following files in <code>/opt/mapr/conf/conf.d</code> that the installation process creates. </p>
+<p>Configure a multitenant cluster manager to account for resources required for Drill. Configuring <code>drill-env.sh</code> allocates resources for Drill to use during query execution. It might be necessary to configure the cluster manager from committing the resources to other processes.</p>
-<ul>
-<li><code>warden.drill-bits.conf</code></li>
-<li><code>warden.nodemanager.conf</code></li>
-<li><code>warden.resourcemanager.conf</code></li>
-</ul>
-
-<p>Configure Drill memory by modifying <code>warden.drill-bits.conf</code> in YARN and non-YARN clusters. Configure other resources by modifying <code>warden.nodemanager.conf</code>and <code>warden.resourcemanager.conf</code>in a YARN-enabled cluster.</p>
-
-<h2 id="configuring-drill-memory-in-a-mixed-cluster">Configuring Drill Memory in a Mixed Cluster</h2>
-
-<p>Add the following lines to the <code>warden.drill-bits.conf</code> file to configure memory resources for Drill:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">service.heapsize.min=<some value in MB>
-service.heapsize.max=<some value in MB>
-service.heapsize.percent=<a whole number>
-</code></pre></div>
-<p>The service.heapsize.percent is the percentage of memory for the service bounded by minimum and maximum values.</p>
-
-<h2 id="configuring-drill-in-a-yarn-enabled-mapr-cluster">Configuring Drill in a YARN-enabled MapR Cluster</h2>
+<h2 id="configuring-drill-in-a-yarn-enabled">Configuring Drill in a YARN-enabled</h2>
<p>To add Drill to a YARN-enabled cluster, change memory resources to suit your application. For example, you have 120G of available memory that you allocate to following workloads in a Yarn-enabled cluster:</p>
@@ -891,39 +863,11 @@ There is at least one instance in a cluster, more if you configure high availabi
There is one instance per node. </li>
</ul>
-<p>ResourceManager and NodeManager memory in <code>warden.resourcemanager.conf</code> and
- <code>warden.nodemanager.conf</code> are set to the following defaults. </p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">service.heapsize.min=64
-service.heapsize.max=325
-service.heapsize.percent=2
-</code></pre></div>
-<p>Change these settings for NodeManager and ResourceManager to reconfigure the total memory required for YARN services to run. If you want to place an upper limit on memory set YARN_NODEMANAGER_HEAPSIZE or YARN_RESOURCEMANAGER_HEAPSIZE environment variable in /opt/mapr/hadoop/hadoop-2.5.1/etc/hadoop/yarn-env.sh. The -Xmx option is not set, allowing memory on to grow as needed.</p>
+<p>Configure NodeManager and ResourceManager to reconfigure the total memory required for YARN services to run. If you want to place an upper limit on memory set YARN_NODEMANAGER_HEAPSIZE or YARN_RESOURCEMANAGER_HEAPSIZE environment variable. Do not set the <code>-Xmx</code> option to allow the heap to grow as needed.</p>
-<h3 id="mapreduce-v1-resources">MapReduce v1 Resources</h3>
+<h3 id="mapreduce-resources">MapReduce Resources</h3>
-<p>The following default settings in /opt/mapr/conf/warden.conf control MapReduce v1 memory:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">mr1.memory.percent=50
-mr1.cpu.percent=50
-mr1.disk.percent=50
-</code></pre></div>
-<p>Modify these settings to reconfigure MapReduce v1 resources to suit your application needs, as described in section <a href="http://doc.mapr.com/display/MapR/Resource+Allocation+for+Jobs+and+Applications">"Resource Allocation for Jobs and Applications"</a> of the MapR documentation. Remaining memory is given to YARN applications. </p>
-
-<h3 id="mapreduce-v2-and-other-resources">MapReduce v2 and other Resources</h3>
-
-<p>You configure memory for each service by setting three values in <code>warden.conf</code>.</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">service.command.<servicename>.heapsize.percent
-service.command.<servicename>.heapsize.max
-service.command.<servicename>.heapsize.min
-</code></pre></div>
-<p>Configure memory for other services in the same manner, as described in <a href="http://doc.mapr.com/display/MapR/warden.%3Cservicename%3E.conf">MapR documentation</a></p>
-
-<p>For more information about managing memory in a MapR cluster, see the following sections in the MapR documentation:</p>
-
-<ul>
-<li><a href="http://doc.mapr.com/display/MapR40x/Memory+Allocation+for+Nodes">Memory Allocation for Nodes</a><br></li>
-<li><a href="http://doc.mapr.com/display/MapR40x/Cluster+Resource+Allocation">Cluster Resource Allocation</a><br></li>
-<li><a href="http://doc.mapr.com/display/MapR40x/Customize+Memory+Settings+for+MapReduce+v1">Customizing Memory Settings for MapReduce v1</a><br></li>
-</ul>
+<p>Modify MapReduce memory to suit your application needs. Remaining memory is typically given to YARN applications. </p>
<h2 id="how-to-manage-drill-cpu-resources">How to Manage Drill CPU Resources</h2>
http://git-wip-us.apache.org/repos/asf/drill-site/blob/01525b6b/docs/configuring-resources-for-a-shared-drillbit/index.html
----------------------------------------------------------------------
diff --git a/docs/configuring-resources-for-a-shared-drillbit/index.html b/docs/configuring-resources-for-a-shared-drillbit/index.html
index cae0c1a..094e6b4 100644
--- a/docs/configuring-resources-for-a-shared-drillbit/index.html
+++ b/docs/configuring-resources-for-a-shared-drillbit/index.html
@@ -188,11 +188,11 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/getting-to-know-the-drill-sandbox/">Getting to Know the Drill Sandbox</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-1-learn-about-the-data-set/">Lession 1: Learn about the Data Set</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-1-learn-about-the-data-set/">Lesson 1: Learn about the Data Set</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-2-run-queries-with-ansi-sql/">Lession 2: Run Queries with ANSI SQL</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-2-run-queries-with-ansi-sql/">Lesson 2: Run Queries with ANSI SQL</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/lession-3-run-queries-on-complex-data-types/">Lession 3: Run Queries on Complex Data Types</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/lesson-3-run-queries-on-complex-data-types/">Lesson 3: Run Queries on Complex Data Types</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/summary/">Summary</a></li>
@@ -401,11 +401,19 @@
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-drill/">Using MicroStrategy Analytics with Drill</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-microstrategy-analytics-with-apache-drill/">Using MicroStrategy Analytics with Apache Drill</a></li>
- <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tibco-spotfire-desktop/">Using Apache Drill with Tibco Spotfire Desktop</a></li>
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-tibco-spotfire-with-drill/">Using Tibco Spotfire with Drill</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-desktop/">Using Apache Drill with Tableau 9 Desktop</a></li>
+
+
+
+ <li class="toctree-l2"><a class="reference internal" href="/docs/using-apache-drill-with-tableau-9-server/">Using Apache Drill with Tableau 9 Server</a></li>
</ul>
@@ -559,17 +567,17 @@
<li class="toctree-l3"><a class="reference internal" href="/docs/alter-system-command/">ALTER SYSTEM Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-table-as-ctas-command/">CREATE TABLE AS (CTAS) Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/create-view-command/">CREATE VIEW Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/describe-command/">DESCRIBE Command</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN commands</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/explain-commands/">EXPLAIN Commands</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/select-statements/">SELECT Statements</a></li>
- <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES AND SHOW SCHEMAS Command</a></li>
+ <li class="toctree-l3"><a class="reference internal" href="/docs/show-databases-and-show-schemas-command/">SHOW DATABASES and SHOW SCHEMAS Command</a></li>
<li class="toctree-l3"><a class="reference internal" href="/docs/show-files-command/">SHOW FILES Command</a></li>
@@ -826,9 +834,9 @@
<div class="int_text" align="left">
- <p>To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization in addition to memory, as described in the previous section.</p>
+ <p>To manage a cluster in which multiple users share a Drillbit, you configure Drill queuing and parallelization in addition to memory, as described in the previous section, <a href="/docs/configuring-drill-memory/">"Configuring Drill Memory"</a>.</p>
-<h2 id="configuring-drill-query-queuing">Configuring Drill Query Queuing</h2>
+<h2 id="configuring-query-queuing">Configuring Query Queuing</h2>
<p>Set <a href="/docs/configuration-options-introduction/">options in sys.options</a> to enable and manage query queuing, which is turned off by default. There are two types of queues: large and small. You configure a maximum number of queries that each queue allows by configuring the following options in the <code>sys.options</code> table:</p>
@@ -839,7 +847,7 @@
<h3 id="example-configuration">Example Configuration</h3>
-<p>For example, you configure the queue reserved for large queries to hold a 5-query maximum. You configure the queue reserved for small queries to hold 20 queries. Users start to run queries, and Drill receives the following query requests in this order:</p>
+<p>For example, you configure the queue reserved for large queries for a 5-query maximum. You configure the queue reserved for small queries for 20 queries. Users start to run queries, and Drill receives the following query requests in this order:</p>
<ul>
<li>Query A (blue): 1 billion records, Drill estimates 10 million rows will be processed<br></li>
@@ -854,7 +862,7 @@
<p>The Drill queuing configuration in this example tends to give many users running small queries a rapid response. Users running a large query might experience some delay until an earlier-received large query returns, freeing space in the large queue to process queries that are waiting.</p>
-<h2 id="controlling-parallelization">Controlling Parallelization</h2>
+<h2 id="configuring-parallelization">Configuring Parallelization</h2>
<p>By default, Drill parallelizes operations when number of records manipulated within a fragment reaches 100,000. When parallelization of operations is high, the cluster operates as fast as possible, which is fine for a single user. In a contentious multi-tenant situation, however, you need to reduce parallelization to levels based on user needs.</p>
@@ -883,7 +891,7 @@ A parallelizer in the Foreman transforms the physical plan into multiple phases.
<h2 id="data-isolation">Data Isolation</h2>
-<p>Tenants can share data on a cluster using Drill views and impersonation. ??Link to impersonation doc.??</p>
+<p>Tenants can share data on a cluster using Drill views and <a href="/docs/configuring-user-impersonation">impersonation</a>. </p>