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/19 01:36:32 UTC
[09/31] drill git commit: sqlline to Drill shell
sqlline to Drill shell
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/6089ab01
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/6089ab01
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/6089ab01
Branch: refs/heads/gh-pages
Commit: 6089ab014e2d15d450acfd999beb51ae0d62a6bd
Parents: cd0a0e9
Author: Kristine Hahn <kh...@maprtech.com>
Authored: Sun May 17 17:35:26 2015 -0700
Committer: Kristine Hahn <kh...@maprtech.com>
Committed: Sun May 17 17:35:26 2015 -0700
----------------------------------------------------------------------
_docs/075-getting-query-information.md | 4 +---
.../035-plugin-configuration-introduction.md | 10 +++++-----
.../030-starting-drill-on-linux-and-mac-os-x.md | 2 +-
.../sql-functions/020-data-type-conversion.md | 2 +-
_docs/tutorials/020-drill-in-10-minutes.md | 4 ++--
.../tutorials/030-analyzing-the-yelp-academic-dataset.md | 4 ++--
_docs/tutorials/050-analyzing-highly-dynamic-datasets.md | 4 ++--
.../020-getting-to-know-the-drill-sandbox.md | 2 +-
.../030-lesson-1-learn-about-the-data-set.md | 10 +++++-----
9 files changed, 20 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/6089ab01/_docs/075-getting-query-information.md
----------------------------------------------------------------------
diff --git a/_docs/075-getting-query-information.md b/_docs/075-getting-query-information.md
index 58e0a62..57c1678 100644
--- a/_docs/075-getting-query-information.md
+++ b/_docs/075-getting-query-information.md
@@ -2,9 +2,7 @@
title: "Getting Query Information"
parent: "Query Audit Logging"
---
-The query log provides audit log functionality for the queries executed by various drillbits in the cluster. To access the query log, go to `sqlline_queries.json` file in the `log` directory of the Drill installation. The log records important information about queries executed on the Drillbit where Drill runs. The log includes query text, start time, end time, user, status, schema, and the query id.
-
-You can query one of the following files, depending on whether you run Drill in embedded or distributed mode, to get audit logging information.:
+The query log provides audit log functionality for the queries executed by various drillbits in the cluster. The log records important information about queries executed on the Drillbit where Drill runs. The log includes query text, start time, end time, user, status, schema, and the query id. You can query one of the following log files, depending on whether you run Drill in embedded or distributed mode, to get audit logging information.:
* `sqlline_queries.json` (embedded mode)
* `drillbit_queries.json` (distributed mode)
http://git-wip-us.apache.org/repos/asf/drill/blob/6089ab01/_docs/connect-a-data-source/035-plugin-configuration-introduction.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/035-plugin-configuration-introduction.md b/_docs/connect-a-data-source/035-plugin-configuration-introduction.md
index 0cfc206..44e2e11 100644
--- a/_docs/connect-a-data-source/035-plugin-configuration-introduction.md
+++ b/_docs/connect-a-data-source/035-plugin-configuration-introduction.md
@@ -78,13 +78,13 @@ The following table describes the attributes you configure for storage plugins i
</tr>
<tr>
<td>"formats"</td>
- <td>"psv"<br>"csv"<br>"tsv"<br>"parquet"<br>"json"<br>"avro"<br>"maprdb"*</td>
+ <td>"psv"<br>"csv"<br>"tsv"<br>"parquet"<br>"json"<br>"avro"<br>"maprdb" *</td>
<td>yes</td>
<td>One or more file formats of data Drill can read. Drill can implicitly detect some file formats based on the file extension or the first few bits of data within the file, but you need to configure an option for others.</td>
</tr>
<tr>
<td>"formats" . . . "type"</td>
- <td>"text"<br>"parquet"<br>"json"<br>"maprdb"</td>
+ <td>"text"<br>"parquet"<br>"json"<br>"maprdb" *</td>
<td>yes</td>
<td>The type of the format specified. For example, you can define two formats, csv and psv, as type "Text", but having different delimiters. Drill enables the maprdb plugin if you define the maprdb type.</td>
</tr>
@@ -102,7 +102,7 @@ The following table describes the attributes you configure for storage plugins i
</tr>
</table>
-\* Only appears when you install Drill on a cluster using the mapr-drill package.
+\* Pertains only to distributed drill installations using the mapr-drill package.
The configuration of other attributes, such as `size.calculator.enabled` in the hbase plugin and `configProps` in the hive plugin, are implementation-dependent and beyond the scope of this document.
@@ -119,10 +119,10 @@ For example, using uppercase letters in the query after defining the storage plu
Drill provides a REST API that you can use to create a storage plugin. Use an HTTP POST and pass two properties:
-* name
+* name
The plugin name.
-* config
+* config
The storage plugin definition as you would enter it in the Web UI.
For example, this command creates a plugin named myplugin for reading files of an unknown type located on the root of the file system:
http://git-wip-us.apache.org/repos/asf/drill/blob/6089ab01/_docs/install/installing-drill-in-embedded-mode/030-starting-drill-on-linux-and-mac-os-x.md
----------------------------------------------------------------------
diff --git a/_docs/install/installing-drill-in-embedded-mode/030-starting-drill-on-linux-and-mac-os-x.md b/_docs/install/installing-drill-in-embedded-mode/030-starting-drill-on-linux-and-mac-os-x.md
index 2bbfede..cdbdf20 100644
--- a/_docs/install/installing-drill-in-embedded-mode/030-starting-drill-on-linux-and-mac-os-x.md
+++ b/_docs/install/installing-drill-in-embedded-mode/030-starting-drill-on-linux-and-mac-os-x.md
@@ -8,7 +8,7 @@ Start the Drill shell using the `drill-embedded` command. The command uses a jdb
cd apache-drill-1.0.0
-2. Issue the following command to launch SQLLine:
+2. Issue the following command to start the Drill shell:
bin/drill-embedded
http://git-wip-us.apache.org/repos/asf/drill/blob/6089ab01/_docs/sql-reference/sql-functions/020-data-type-conversion.md
----------------------------------------------------------------------
diff --git a/_docs/sql-reference/sql-functions/020-data-type-conversion.md b/_docs/sql-reference/sql-functions/020-data-type-conversion.md
index 3ad20f7..239da85 100644
--- a/_docs/sql-reference/sql-functions/020-data-type-conversion.md
+++ b/_docs/sql-reference/sql-functions/020-data-type-conversion.md
@@ -731,7 +731,7 @@ Currently Drill does not support conversion of a date, time, or timestamp from o
export DRILL_JAVA_OPTS="-Xms1G -Xmx$DRILL_MAX_HEAP -XX:MaxDirectMemorySize=$DRILL_MAX_DIRECT_MEMORY -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=1G -ea -Duser.timezone=UTC"
-3. Restart SQLLine.
+3. Restart the Drill shell.
4. Confirm that Drill is now set to UTC:
http://git-wip-us.apache.org/repos/asf/drill/blob/6089ab01/_docs/tutorials/020-drill-in-10-minutes.md
----------------------------------------------------------------------
diff --git a/_docs/tutorials/020-drill-in-10-minutes.md b/_docs/tutorials/020-drill-in-10-minutes.md
index 98f5758..95db7a9 100755
--- a/_docs/tutorials/020-drill-in-10-minutes.md
+++ b/_docs/tutorials/020-drill-in-10-minutes.md
@@ -15,7 +15,7 @@ You can install Drill in embedded mode on a machine running Linux, Mac OS X, or
This installation procedure includes how to download the Apache Drill archive and extract the contents to a directory on your machine. The Apache Drill archive contains sample JSON and Parquet files that you can query immediately.
-After installing Drill, you start SQLLine. SQLLine is a pure-Java console-based utility for connecting to relational databases and executing SQL commands. SQLLine is used as the shell for Drill. Drill follows the ANSI SQL: 2011 standard with [extensions]({{site.baseurl}}/docs/sql-extensions/) for nested data formats and other capabilities.
+After installing Drill, you start the Drill shell. The Drill shell is a pure-Java console-based utility for connecting to relational databases and executing SQL commands. Drill follows the ANSI SQL: 2011 standard with [extensions]({{site.baseurl}}/docs/sql-extensions/) for nested data formats and other capabilities.
## Embedded Mode Installation Prerequisites
@@ -98,7 +98,7 @@ At this point, you can [run queries]({{ site.baseurl }}/docs/drill-in-10-minutes
## Stopping Drill
-Issue the following command when you want to exit SQLLine:
+Issue the following command when you want to exit the Drill shell:
!quit
http://git-wip-us.apache.org/repos/asf/drill/blob/6089ab01/_docs/tutorials/030-analyzing-the-yelp-academic-dataset.md
----------------------------------------------------------------------
diff --git a/_docs/tutorials/030-analyzing-the-yelp-academic-dataset.md b/_docs/tutorials/030-analyzing-the-yelp-academic-dataset.md
index 7e638b6..3a53efd 100644
--- a/_docs/tutorials/030-analyzing-the-yelp-academic-dataset.md
+++ b/_docs/tutorials/030-analyzing-the-yelp-academic-dataset.md
@@ -35,9 +35,9 @@ want to scale your environment.
tar -xvf apache-drill-0.1.0.tar.gz
-### Step 3: Launch SQLLine, a JDBC application that ships with Drill
+### Step 3: Start the Drill shell.
- bin/sqlline -u jdbc:drill:zk=local
+ bin/drill-embedded
That’s it! You are now ready explore the data.
http://git-wip-us.apache.org/repos/asf/drill/blob/6089ab01/_docs/tutorials/050-analyzing-highly-dynamic-datasets.md
----------------------------------------------------------------------
diff --git a/_docs/tutorials/050-analyzing-highly-dynamic-datasets.md b/_docs/tutorials/050-analyzing-highly-dynamic-datasets.md
index ffbf1b3..bb5680b 100644
--- a/_docs/tutorials/050-analyzing-highly-dynamic-datasets.md
+++ b/_docs/tutorials/050-analyzing-highly-dynamic-datasets.md
@@ -38,9 +38,9 @@ Install Drill locally on your desktop (embedded mode). You don’t need Hadoop.
----------
-Step 2: Launch the SQLLine, a pre-packaged JDBC-based application with Drill
+Step 2: Start the Drill shell.
- bin/sqlline -u jdbc:drill:zk=local
+ bin/drill-embedded
----------
http://git-wip-us.apache.org/repos/asf/drill/blob/6089ab01/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md
----------------------------------------------------------------------
diff --git a/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md b/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md
index ee5133f..bf1a136 100644
--- a/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md
+++ b/_docs/tutorials/learn-drill-with-the-mapr-sandbox/020-getting-to-know-the-drill-sandbox.md
@@ -12,7 +12,7 @@ example:
Using the secure shell instead of the VM interface has some advantages. You can copy/paste commands from the tutorial and avoid mouse control problems.
-Drill includes SQLLine, a JDBC utility for connecting to relational databases and executing SQL commands. `SQLLine` is a sql client on the sandbox that starts Drill only in embedded mode. After logging into the sandbox, use the `SQLLine` command to start SQLLine for executing Drill queries in embedded mode.
+Drill includes a shell for connecting to relational databases and executing SQL commands. On the sandbox, the Drill shell runs in embedded mode. After logging into the sandbox, use the `SQLLine` command to start SQLLine for executing Drill queries in embedded mode.
[mapr@maprdemo ~]# sqlline
sqlline version 1.1.6
http://git-wip-us.apache.org/repos/asf/drill/blob/6089ab01/_docs/tutorials/learn-drill-with-the-mapr-sandbox/030-lesson-1-learn-about-the-data-set.md
----------------------------------------------------------------------
diff --git a/_docs/tutorials/learn-drill-with-the-mapr-sandbox/030-lesson-1-learn-about-the-data-set.md b/_docs/tutorials/learn-drill-with-the-mapr-sandbox/030-lesson-1-learn-about-the-data-set.md
index a6153d1..9344006 100644
--- a/_docs/tutorials/learn-drill-with-the-mapr-sandbox/030-lesson-1-learn-about-the-data-set.md
+++ b/_docs/tutorials/learn-drill-with-the-mapr-sandbox/030-lesson-1-learn-about-the-data-set.md
@@ -22,17 +22,17 @@ This lesson consists of select * queries on each data source.
## Before You Begin
-### Start SQLLine
+### Start the Drill Shell
-If SQLLine is not already started, use a Terminal or Command window to log
+If the Drill shell is not already started, use a Terminal or Command window to log
into the demo VM as root, then enter `sqlline`, as described in ["Getting to Know the Sandbox"]({{ site.baseurl }}/docs/getting-to-know-the-drill-sandbox):
-You can run queries from the `sqlline` prompt to complete the tutorial. To exit from
-SQLLine, type:
+You can run queries to complete the tutorial. To exit from
+the Drill shell, type:
0: jdbc:drill:> !quit
-Examples in this tutorial use SQLLine. You can also execute queries using the Drill Web UI.
+Examples in this tutorial use the Drill shell. You can also execute queries using the Drill Web UI.
### List the available workspaces and databases: