You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by kr...@apache.org on 2015/12/10 20:06:20 UTC
drill git commit: remove PAM
Repository: drill
Updated Branches:
refs/heads/gh-pages dc5b007d6 -> 0aa80fba6
remove PAM
formatting, skipFirstLine clarification
Tug's PR 291
Andres schema= last on sqlline
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/0aa80fba
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/0aa80fba
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/0aa80fba
Branch: refs/heads/gh-pages
Commit: 0aa80fba66c67a03ff6a3959c245e1141f448b58
Parents: dc5b007
Author: Kris Hahn <kr...@apache.org>
Authored: Thu Dec 10 10:50:40 2015 -0800
Committer: Kris Hahn <kr...@apache.org>
Committed: Thu Dec 10 11:00:53 2015 -0800
----------------------------------------------------------------------
.../078-configuring-web-ui-and-rest-api-security.md | 2 +-
.../035-plugin-configuration-basics.md | 10 ++++------
.../025-tutorial-develop-a-simple-function.md | 4 +++-
.../030-starting-drill-on-linux-and-mac-os-x.md | 2 +-
.../050-starting-drill-on-windows.md | 2 +-
_docs/odbc-jdbc-interfaces/015-using-jdbc-driver.md | 8 ++++----
6 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/0aa80fba/_docs/configure-drill/078-configuring-web-ui-and-rest-api-security.md
----------------------------------------------------------------------
diff --git a/_docs/configure-drill/078-configuring-web-ui-and-rest-api-security.md b/_docs/configure-drill/078-configuring-web-ui-and-rest-api-security.md
index 76ed2f1..96576f9 100644
--- a/_docs/configure-drill/078-configuring-web-ui-and-rest-api-security.md
+++ b/_docs/configure-drill/078-configuring-web-ui-and-rest-api-security.md
@@ -8,7 +8,7 @@ you can limit the access of certain users to Web Console functionality, such as
With Web Console security in place, users who do not have administrator privileges need to use the SHOW SCHEMAS command instead of the Web Console for storage plugin configuration information. -->
## HTTPS Support
-Drill 1.2 uses the Linux Pluggable Authentication Module (PAM) and code-level support for transport layer security (TLS) to secure the Web Console and REST API. By default, the Web Console and REST API support the HTTP protocol. You set the following start-up option to TRUE to enable HTTPS support:
+Drill 1.2 uses code-level support for transport layer security (TLS) to secure the Web Console and REST API. By default, the Web Console and REST API support the HTTP protocol. You set the following start-up option to TRUE to enable HTTPS support:
`drill.exec.http.ssl_enabled`
http://git-wip-us.apache.org/repos/asf/drill/blob/0aa80fba/_docs/connect-a-data-source/035-plugin-configuration-basics.md
----------------------------------------------------------------------
diff --git a/_docs/connect-a-data-source/035-plugin-configuration-basics.md b/_docs/connect-a-data-source/035-plugin-configuration-basics.md
index 94e5a11..360e2bf 100644
--- a/_docs/connect-a-data-source/035-plugin-configuration-basics.md
+++ b/_docs/connect-a-data-source/035-plugin-configuration-basics.md
@@ -84,13 +84,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"*<br>"sequencefile"</td>
+ <td>"psv"<br>"csv"<br>"tsv"<br>"parquet"<br>"json"<br>"avro"<br>"maprdb"<br>"sequencefile"</td>
<td>yes</td>
- <td>One or more valid file formats for reading. Drill implicitly detects formats of some files based on extension or bits of data in the file; others require configuration.</td>
+ <td>One or more valid file formats for reading. Drill detects formats of some files; others require configuration. The maprdb format is in installations of the mapr-drill package. </td>
</tr>
<tr>
<td>"formats" . . . "type"</td>
- <td>"text"<br>"parquet"<br>"json"<br>"maprdb"*<br>"avro"<br>"sequencefile"</td>
+ <td>"text"<br>"parquet"<br>"json"<br>"maprdb"<br>"avro"<br>"sequencefile"</td>
<td>yes</td>
<td>Format type. You can define two formats, csv and psv, as type "Text", but having different delimiters. </td>
</tr>
@@ -135,13 +135,11 @@ The following table describes the attributes you configure for storage plugins i
<td>"formats" . . . "extractHeader"</td>
<td>true</td>
<td>no</td>
- <td>Set to true to extract and use headers as column names when reading a delimited text file, false otherwise. Ensure skipFirstLine=false when extractHeader=true.
+ <td>Set to true to extract and use headers as column names when reading a delimited text file, false otherwise. Ensure skipFirstLine is not true when extractHeader=false.
</td>
</tr>
</table>
-\* Pertains only to distributed Drill installations using the mapr-drill package.
-
## Using the Formats Attributes
You set the formats attributes, such as skipFirstLine, in the `formats` area of the storage plugin configuration. When setting attributes for text files, such as CSV, you also need to set the `sys.options` property `exec.storage.enable_new_text_reader` to true (the default). For more information and examples of using formats for text files, see ["Text Files: CSV, TSV, PSV"]({{site.baseurl}}{{site.baseurl}}/docs/text-files-csv-tsv-psv/).
http://git-wip-us.apache.org/repos/asf/drill/blob/0aa80fba/_docs/develop-custom-functions/025-tutorial-develop-a-simple-function.md
----------------------------------------------------------------------
diff --git a/_docs/develop-custom-functions/025-tutorial-develop-a-simple-function.md b/_docs/develop-custom-functions/025-tutorial-develop-a-simple-function.md
index cae47d6..505a7bf 100644
--- a/_docs/develop-custom-functions/025-tutorial-develop-a-simple-function.md
+++ b/_docs/develop-custom-functions/025-tutorial-develop-a-simple-function.md
@@ -203,7 +203,9 @@ For simplicity, use maven to build your project in a pom.xml file as follows:
```
## Add a drill-module.conf File to Resources
-Add a `drill-module.conf` file in the resources folder of your project. The presence of this file tells Drill that your jar contains a custom function. If you have no specific configuration to set for your function, you can keep this file empty.
+Add a `drill-module.conf` file in the resources folder of your project. The presence of this file tells Drill that your jar contains a custom function. Put the following line in the `drill-module.config`:
+
+`drill.classpath.scanning.packages += "org.apache.drill.contrib.function"`
## Build and Deploy the Function
Build the function using mvn package:
http://git-wip-us.apache.org/repos/asf/drill/blob/0aa80fba/_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 8153154..b69626c 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
@@ -16,7 +16,7 @@ To start the Drill shell in embedded mode, use the `drill-embedded` command. Int
To start Drill, you can also use the **sqlline** command and a custom connection string, as described in detail in ["Using an Ad-Hoc Connection to Drill"]({{site.baseurl}}/docs/starting-drill-in-distributed-mode/#using-an-ad-hoc-connection-to-drill). For example, you can specify the default storage plugin configuration when you start the shell. Doing so eliminates the need to specify the storage plugin configuration in the query. For example, this command specifies the `dfs` storage plugin:
-`bin/sqlline –u jdbc:drill:schema=dfs;zk=local`
+`bin/sqlline –u jdbc:drill:zk=local;schema=dfs`
If you start Drill on one network, and then want to use Drill on another network, such as your home network, restart Drill.
http://git-wip-us.apache.org/repos/asf/drill/blob/0aa80fba/_docs/install/installing-drill-in-embedded-mode/050-starting-drill-on-windows.md
----------------------------------------------------------------------
diff --git a/_docs/install/installing-drill-in-embedded-mode/050-starting-drill-on-windows.md b/_docs/install/installing-drill-in-embedded-mode/050-starting-drill-on-windows.md
index ef934a3..181c223 100644
--- a/_docs/install/installing-drill-in-embedded-mode/050-starting-drill-on-windows.md
+++ b/_docs/install/installing-drill-in-embedded-mode/050-starting-drill-on-windows.md
@@ -16,7 +16,7 @@ The [Drill prompt]({{site.baseurl}}/docs/starting-drill-on-linux-and-mac-os-x/#a
You can use the schema option in the **sqlline** command to specify a storage plugin. Specifying the storage plugin when you start up eliminates the need to specify the storage plugin in the query. For example, this command specifies the `dfs` storage plugin:
-`C:\bin\sqlline sqlline.bat –u "jdbc:drill:schema=dfs;zk=local"`
+`C:\bin\sqlline sqlline.bat –u "jdbc:drill:zk=local;schema=dfs"`
If you start Drill on one network, and then want to use Drill on another network, such as your home network, restart Drill.
http://git-wip-us.apache.org/repos/asf/drill/blob/0aa80fba/_docs/odbc-jdbc-interfaces/015-using-jdbc-driver.md
----------------------------------------------------------------------
diff --git a/_docs/odbc-jdbc-interfaces/015-using-jdbc-driver.md b/_docs/odbc-jdbc-interfaces/015-using-jdbc-driver.md
index adbfd29..cabe485 100755
--- a/_docs/odbc-jdbc-interfaces/015-using-jdbc-driver.md
+++ b/_docs/odbc-jdbc-interfaces/015-using-jdbc-driver.md
@@ -35,8 +35,8 @@ drill-1.0.0.tar.gz](http://apache.osuosl.org/drill/drill-1.0.0/apache-drill-1.0.
The format of the JDBC URL differs slightly, depending on the way you want to connect to the Drillbit: random, local, or direct. This section covers using the URL for a random or local connection. Using a URL to [directly connect to a Drillbit]({{site.baseurl}}/docs/using-the-jdbc-driver/#using-the-jdbc-url-format-for-a-direct-drillbit-connection) is covered later. If you want ZooKeeper to randomly choose a Drillbit in the cluster, or if you want to connect to the local Drillbit, the format of the driver URL is:
-`jdbc:drill:[schema=<storage plugin>;]zk=<zk name>[:<port>][,<zk name2>[:<port>]... `
- `]<directory>/<cluster ID>`
+`jdbc:drill:zk=<zk name>[:<port>][,<zk name2>[:<port>]... `
+ `<directory>/<cluster ID>;[schema=<storage plugin>]`
where
@@ -80,8 +80,8 @@ drill.exec: {
If you want to connect directly to a Drillbit instead of using ZooKeeper to choose the Drillbit, replace `zk=<zk name>` with `drillbit=<node>` as shown in the following URL.
-`jdbc:drill:[schema=<storage plugin>;]drillbit=<node name>[:<port>][,<node name2>[:<port>]... `
- `]<directory>/<cluster ID>`
+`jdbc:drill:drillbit=<node name>[:<port>][,<node name2>[:<port>]... `
+ `<directory>/<cluster ID>[schema=<storage plugin>]`
where