This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/drill-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 8fad1a4 Automatic Site Publish by Buildbot
8fad1a4 is described below
commit 8fad1a4b7249e40ea19fd3e8057ac94b3f0bd611
Author: buildbot <[email protected]>
AuthorDate: Wed Nov 24 10:17:01 2021 +0000
Automatic Site Publish by Buildbot
---
output/docs/rdbms-storage-plugin/index.html | 78 +++++++++++++++-----------
output/docs/s3-storage-plugin/index.html | 28 ++++++---
output/feed.xml | 4 +-
output/zh/docs/rdbms-storage-plugin/index.html | 78 +++++++++++++++-----------
output/zh/docs/s3-storage-plugin/index.html | 28 ++++++---
output/zh/feed.xml | 4 +-
6 files changed, 136 insertions(+), 84 deletions(-)
diff --git a/output/docs/rdbms-storage-plugin/index.html
b/output/docs/rdbms-storage-plugin/index.html
index 2567478..9b8735b 100644
--- a/output/docs/rdbms-storage-plugin/index.html
+++ b/output/docs/rdbms-storage-plugin/index.html
@@ -1475,7 +1475,7 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
</span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"root"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"mypassword"</span><span
class="p">,</span><span class="w">
</span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="w">
-</span><span class="p">}</span><span class="w">
+</span><span class="p">}</span><span class="w">
</span></code></pre></div> </div>
</li>
</ol>
@@ -1500,50 +1500,45 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
<h2 id="example-configurations">Example Configurations</h2>
-<h3 id="example-oracle-configuration">Example Oracle Configuration</h3>
-
-<p>Download and install Oracle’s Thin <a
href="http://www.oracle.com/technetwork/database/features/jdbc/default-2280470.html">ojdbc7.12.1.0.2.jar</a>
driver and copy it to all nodes in your cluster.</p>
+<h3 id="example-clickhouse-configuration">Example ClickHouse configuration</h3>
+<p>Download and install the <a
href="https://github.com/ClickHouse/clickhouse-jdbc">official ClickHouse JDBC
driver</a> on all of the nodes in your cluster.</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
- </span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
- </span><span class="s2">"driver:"</span><span class="w"> </span><span
class="s2">"oracle.jdbc.OracleDriver"</span><span class="p">,</span><span
class="w">
- </span><span class="s2">"url:"</span><span class="w"> </span><span
class="s2">"jdbc:oracle:thin:user/[email protected]:1521/ORCL"</span><span
class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"driver"</span><span class="p">:</span><span
class="w"> </span><span
class="s2">"ru.yandex.clickhouse.ClickHouseDriver"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"url"</span><span class="p">:</span><span
class="w"> </span><span
class="s2">"jdbc:clickhouse://1.2.3.4:8123.default"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"user"</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"password"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
-<h3 id="example-sql-server-configuration">Example SQL Server Configuration</h3>
-
-<p>For SQL Server, Drill has been tested with Microsoft’s <a
href="https://www.microsoft.com/en-US/download/details.aspx?id=11774">sqljdbc41.4.2.6420.100.jar</a>
driver. Copy this jar file to all Drillbits.</p>
+<h3 id="example-mysql-configuration">Example MySQL Configuration</h3>
-<div class="admonition note">
- <p class="first admonition-title">Note</p>
- <p class="last">You'll need to provide a database name as part of your JDBC
connection string for Drill to correctly expose MSSQL schemas. </p>
-</div>
+<p>For MySQL, Drill has been tested with MySQL’s <a
href="http://dev.mysql.com/downloads/connector/j/">mysql-connector-java-5.1.37-bin.jar</a>
driver. Copy this to all nodes.</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
</span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
- </span><span class="nl">"driver"</span><span class="p">:</span><span
class="w"> </span><span
class="s2">"com.microsoft.sqlserver.jdbc.SQLServerDriver"</span><span
class="p">,</span><span class="w">
- </span><span class="nl">"url"</span><span class="p">:</span><span class="w">
</span><span
class="s2">"jdbc:sqlserver://1.2.3.4:1433;databaseName=mydatabase"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"driver"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"com.mysql.jdbc.Driver"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"url"</span><span class="p">:</span><span class="w">
</span><span class="s2">"jdbc:mysql://1.2.3.4"</span><span
class="p">,</span><span class="w">
</span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"user"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"password"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
-<h3 id="example-mysql-configuration">Example MySQL Configuration</h3>
+<h3 id="example-oracle-configuration">Example Oracle configuration</h3>
+
+<p>Download and install Oracle’s Thin <a
href="http://www.oracle.com/technetwork/database/features/jdbc/default-2280470.html">ojdbc7.12.1.0.2.jar</a>
driver and copy it to all nodes in your cluster.</p>
-<p>For MySQL, Drill has been tested with MySQL’s <a
href="http://dev.mysql.com/downloads/connector/j/">mysql-connector-java-5.1.37-bin.jar</a>
driver. Copy this to all nodes.</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
</span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
- </span><span class="nl">"driver"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"com.mysql.jdbc.Driver"</span><span
class="p">,</span><span class="w">
- </span><span class="nl">"url"</span><span class="p">:</span><span class="w">
</span><span class="s2">"jdbc:mysql://1.2.3.4"</span><span
class="p">,</span><span class="w">
- </span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"user"</span><span class="p">,</span><span
class="w">
- </span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"password"</span><span class="w">
-</span><span class="p">}</span><span class="w">
+ </span><span class="s2">"driver:"</span><span class="w"> </span><span
class="s2">"oracle.jdbc.OracleDriver"</span><span class="p">,</span><span
class="w">
+ </span><span class="s2">"url:"</span><span class="w"> </span><span
class="s2">"jdbc:oracle:thin:user/[email protected]:1521/ORCL"</span><span
class="w">
+</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
-<h3 id="example-postgresql-configuration">Example PostgreSQL Configuration</h3>
+<h3 id="example-postgresql-configuration">Example PostgreSQL configuration</h3>
<p>Drill is tested with the PostgreSQL driver version <a
href="https://mvnrepository.com/artifact/org.postgresql/postgresql">42.2.11</a>
(any recent driver should work).
Download and copy this driver jar to the <code class="language-plaintext
highlighter-rouge">jars/3rdparty</code> folder on all nodes.</p>
@@ -1560,19 +1555,19 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
</span><span class="nl">"url"</span><span class="p">:</span><span class="w">
</span><span class="s2">"jdbc:postgresql://1.2.3.4/mydatabase"</span><span
class="p">,</span><span class="w">
</span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"user"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"password"</span><span class="w">
-</span><span class="p">}</span><span class="w">
+</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
<p>You may need to qualify a table name with a schema name for Drill to return
data. For example, when querying a table named ips, you must issue the query
against public.ips, as shown in the following example:</p>
-<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre
class="highlight"><code> 0: jdbc:drill:zk=local> use pgdb;
+<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre
class="highlight"><code> 0: jdbc:drill:zk=local> use pgdb;
|------|----------------------------------|
| ok | summary |
|------|----------------------------------|
| true | Default schema changed to [pgdb] |
|------|----------------------------------|
-
- 0: jdbc:drill:zk=local> show tables;
+
+ 0: jdbc:drill:zk=local> show tables;
|--------------|--------------|
| TABLE_SCHEMA | TABLE_NAME |
|--------------|--------------|
@@ -1581,7 +1576,7 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
| pgdb.test | pg_am |
|--------------|--------------|
- 0: jdbc:drill:zk=local> select * from public.ips;
+ 0: jdbc:drill:zk=local> select * from public.ips;
|------|---------|
| ipid | ipv4dot |
|------|---------|
@@ -1590,7 +1585,7 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
|------|---------|
</code></pre></div></div>
-<h3
id="example-of-postgresql-configuration-with-sourceparameters-configuration-property">Example
of PostgreSQL Configuration with <code class="language-plaintext
highlighter-rouge">sourceParameters</code> configuration property</h3>
+<h3
id="example-of-postgresql-configuration-with-sourceparameters-configuration-property">Example
of PostgreSQL configuration with <code class="language-plaintext
highlighter-rouge">sourceParameters</code> configuration property</h3>
<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
</span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
@@ -1605,9 +1600,28 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
</span><span class="nl">"dataSource.cachePrepStmts"</span><span
class="p">:</span><span class="w"> </span><span class="kc">true</span><span
class="p">,</span><span class="w">
</span><span class="nl">"dataSource.prepStmtCacheSize"</span><span
class="p">:</span><span class="w"> </span><span class="mi">250</span><span
class="w">
</span><span class="p">}</span><span class="w">
-</span><span class="p">}</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div></div>
+
+<h3 id="example-sql-server-configuration">Example SQL Server configuration</h3>
+
+<p>For SQL Server, Drill has been tested with Microsoft’s <a
href="https://www.microsoft.com/en-US/download/details.aspx?id=11774">sqljdbc41.4.2.6420.100.jar</a>
driver. Copy this jar file to all Drillbits.</p>
+
+<div class="admonition note">
+ <p class="first admonition-title">Note</p>
+ <p class="last">You'll need to provide a database name as part of your JDBC
connection string for Drill to correctly expose MSSQL schemas. </p>
+</div>
+<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"driver"</span><span class="p">:</span><span
class="w"> </span><span
class="s2">"com.microsoft.sqlserver.jdbc.SQLServerDriver"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"url"</span><span class="p">:</span><span class="w">
</span><span
class="s2">"jdbc:sqlserver://1.2.3.4:1433;databaseName=mydatabase"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"user"</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"password"</span><span class="w">
+</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
+
<div class="doc-nav">
diff --git a/output/docs/s3-storage-plugin/index.html
b/output/docs/s3-storage-plugin/index.html
index 9ea5b03..c783543 100644
--- a/output/docs/s3-storage-plugin/index.html
+++ b/output/docs/s3-storage-plugin/index.html
@@ -1478,7 +1478,7 @@
<name>fs.s3a.endpoint</name>
<value>s3.REGION.amazonaws.com</value>
</property>
- </configuration>
+ </configuration>
</code></pre></div></div>
<h3 id="configuring-drill-to-use-aws-iam-roles-for-accessing-s3">Configuring
Drill to use AWS IAM Roles for Accessing S3</h3>
@@ -1490,7 +1490,7 @@
<name>fs.s3a.aws.credentials.provider</name>
<value>com.amazonaws.auth.InstanceProfileCredentialsProvider</value>
</property>
- </configuration>
+ </configuration>
</code></pre></div></div>
<h2 id="configuring-the-s3-storage-plugin">Configuring the S3 Storage
Plugin</h2>
@@ -1499,7 +1499,7 @@
<p>To configure the S3 storage plugin, log in to the Drill Web UI at <code
class="language-plaintext
highlighter-rouge">http://<drill-hostname>:8047</code>. The <code
class="language-plaintext highlighter-rouge">drill-hostname</code> is a node on
which Drill is running. Go to the <strong>Storage</strong> page and click
<strong>Update</strong> next to the S3 storage plugin option.</p>
-<p><strong>Note:</strong> The <code class="language-plaintext
highlighter-rouge">"config"</code> block in the S3 storage plugin configuration
contains properties to define your AWS credentials. Do not include the <code
class="language-plaintext highlighter-rouge">"config"</code> block in your S3
storage plugin configuration if you defined your AWS credentials in the <code
class="language-plaintext highlighter-rouge">core-site.xml</code> file.</p>
+<p>*Note:** The <code class="language-plaintext
highlighter-rouge">"config"</code> block in the S3 storage plugin configuration
contains properties to define your AWS credentials. Do not include the <code
class="language-plaintext highlighter-rouge">"config"</code> block in your S3
storage plugin configuration if you defined your AWS credentials in the <code
class="language-plaintext highlighter-rouge">core-site.xml</code> file.</p>
<p>Configure the S3 storage plugin configuration to use an external provider
for credentials or directly add the credentials in the configuration itself, as
described in the following sections. Click <strong>Update</strong> to save the
configuration when done.</p>
@@ -1512,7 +1512,7 @@
<p>For subsequent connections, if you want Drill to connect using different
credentials, you can include the <code class="language-plaintext
highlighter-rouge">fs.s3a.impl.disable.cache</code> property in the
configuration. See <a
href="/docs/s3-storage-plugin/#reconnecting-to-an-s3-bucket-using-different-credentials">Reconnecting
to an S3 Bucket Using Different Credentials</a> for more information.</p>
-<p><strong>Configuring the S3 Plugin to use an External Provider</strong><br />
+<p><strong>Configuring the S3 Plugin to use an External Provider</strong>
Add the bucket name and the <code class="language-plaintext
highlighter-rouge">hadoop.security.credential.provider.path</code> property to
the S3 storage plugin configuration. The <code class="language-plaintext
highlighter-rouge">hadoop.security.credential.provider.path</code> property
should point to a file that contains your encrypted passwords. Optionally,
include the <code class="language-plaintext
highlighter-rouge">hadoop.security.credential.clear-text-fallback</code>
property for [...]
<p>The following example shows an S3 storage plugin configuration with the S3
bucket, <code class="language-plaintext
highlighter-rouge">hadoop.security.credential.provider.path</code>, and <code
class="language-plaintext highlighter-rouge">fs.s3a.impl.disable.cache
properties</code> set:</p>
@@ -1528,7 +1528,7 @@ Add the bucket name and the <code
class="language-plaintext highlighter-rouge">h
},
"workspaces": {
...
- }
+ }
</code></pre></div></div>
<h3 id="adding-credentials-directly-to-the-s3-plugin">Adding Credentials
Directly to the S3 Plugin</h3>
@@ -1549,7 +1549,7 @@ Add the bucket name and the <code
class="language-plaintext highlighter-rouge">h
"fs.s3a.impl.disable.cache":"true"
},
"workspaces": {...
- },
+ },
</code></pre></div></div>
<h3 id="reconnecting-to-an-s3-bucket-using-different-credentials">Reconnecting
to an S3 Bucket Using Different Credentials</h3>
@@ -1579,15 +1579,27 @@ Add the bucket name and the <code
class="language-plaintext highlighter-rouge">h
<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre
class="highlight"><code> <configuration>
...
-
+
<property>
<name>fs.s3a.connection.maximum</name>
<value>100</value>
</property>
-
+
</configuration>
</code></pre></div></div>
+<h2 id="public-s3-buckets">Public S3 buckets</h2>
+<p>To query a data in a public S3 bucket, specify the anonymous AWS
credentials provider as is done in the following example based on the public
NYC taxi data bucket.</p>
+
+<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"file"</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"connection"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"s3a://nyc-tlc"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"config"</span><span class="p">:</span><span
class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"fs.s3a.aws.credentials.provider"</span><span
class="p">:</span><span class="w"> </span><span
class="s2">"org.apache.hadoop.fs.s3a.AnonymousAWSCredentialsProvider"</span><span
class="w">
+ </span><span class="p">},</span><span class="w">
+ </span><span class="err">...</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div></div>
diff --git a/output/feed.xml b/output/feed.xml
index 4f589fd..802fbec 100644
--- a/output/feed.xml
+++ b/output/feed.xml
@@ -6,8 +6,8 @@
</description>
<link>/</link>
<atom:link href="/feed.xml" rel="self" type="application/rss+xml"/>
- <pubDate>Wed, 17 Nov 2021 16:55:54 +0000</pubDate>
- <lastBuildDate>Wed, 17 Nov 2021 16:55:54 +0000</lastBuildDate>
+ <pubDate>Wed, 24 Nov 2021 10:14:19 +0000</pubDate>
+ <lastBuildDate>Wed, 24 Nov 2021 10:14:19 +0000</lastBuildDate>
<generator>Jekyll v3.9.1</generator>
<item>
diff --git a/output/zh/docs/rdbms-storage-plugin/index.html
b/output/zh/docs/rdbms-storage-plugin/index.html
index dc3bf44..509d57c 100644
--- a/output/zh/docs/rdbms-storage-plugin/index.html
+++ b/output/zh/docs/rdbms-storage-plugin/index.html
@@ -1475,7 +1475,7 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
</span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"root"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"mypassword"</span><span
class="p">,</span><span class="w">
</span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="w">
-</span><span class="p">}</span><span class="w">
+</span><span class="p">}</span><span class="w">
</span></code></pre></div> </div>
</li>
</ol>
@@ -1500,50 +1500,45 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
<h2 id="example-configurations">Example Configurations</h2>
-<h3 id="example-oracle-configuration">Example Oracle Configuration</h3>
-
-<p>Download and install Oracle’s Thin <a
href="http://www.oracle.com/technetwork/database/features/jdbc/default-2280470.html">ojdbc7.12.1.0.2.jar</a>
driver and copy it to all nodes in your cluster.</p>
+<h3 id="example-clickhouse-configuration">Example ClickHouse configuration</h3>
+<p>Download and install the <a
href="https://github.com/ClickHouse/clickhouse-jdbc">official ClickHouse JDBC
driver</a> on all of the nodes in your cluster.</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
- </span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
- </span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
- </span><span class="s2">"driver:"</span><span class="w"> </span><span
class="s2">"oracle.jdbc.OracleDriver"</span><span class="p">,</span><span
class="w">
- </span><span class="s2">"url:"</span><span class="w"> </span><span
class="s2">"jdbc:oracle:thin:user/[email protected]:1521/ORCL"</span><span
class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"driver"</span><span class="p">:</span><span
class="w"> </span><span
class="s2">"ru.yandex.clickhouse.ClickHouseDriver"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"url"</span><span class="p">:</span><span
class="w"> </span><span
class="s2">"jdbc:clickhouse://1.2.3.4:8123.default"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"user"</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"password"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
-<h3 id="example-sql-server-configuration">Example SQL Server Configuration</h3>
-
-<p>For SQL Server, Drill has been tested with Microsoft’s <a
href="https://www.microsoft.com/en-US/download/details.aspx?id=11774">sqljdbc41.4.2.6420.100.jar</a>
driver. Copy this jar file to all Drillbits.</p>
+<h3 id="example-mysql-configuration">Example MySQL Configuration</h3>
-<div class="admonition note">
- <p class="first admonition-title">Note</p>
- <p class="last">You'll need to provide a database name as part of your JDBC
connection string for Drill to correctly expose MSSQL schemas. </p>
-</div>
+<p>For MySQL, Drill has been tested with MySQL’s <a
href="http://dev.mysql.com/downloads/connector/j/">mysql-connector-java-5.1.37-bin.jar</a>
driver. Copy this to all nodes.</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
</span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
- </span><span class="nl">"driver"</span><span class="p">:</span><span
class="w"> </span><span
class="s2">"com.microsoft.sqlserver.jdbc.SQLServerDriver"</span><span
class="p">,</span><span class="w">
- </span><span class="nl">"url"</span><span class="p">:</span><span class="w">
</span><span
class="s2">"jdbc:sqlserver://1.2.3.4:1433;databaseName=mydatabase"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"driver"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"com.mysql.jdbc.Driver"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"url"</span><span class="p">:</span><span class="w">
</span><span class="s2">"jdbc:mysql://1.2.3.4"</span><span
class="p">,</span><span class="w">
</span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"user"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"password"</span><span class="w">
</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
-<h3 id="example-mysql-configuration">Example MySQL Configuration</h3>
+<h3 id="example-oracle-configuration">Example Oracle configuration</h3>
+
+<p>Download and install Oracle’s Thin <a
href="http://www.oracle.com/technetwork/database/features/jdbc/default-2280470.html">ojdbc7.12.1.0.2.jar</a>
driver and copy it to all nodes in your cluster.</p>
-<p>For MySQL, Drill has been tested with MySQL’s <a
href="http://dev.mysql.com/downloads/connector/j/">mysql-connector-java-5.1.37-bin.jar</a>
driver. Copy this to all nodes.</p>
<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
</span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
- </span><span class="nl">"driver"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"com.mysql.jdbc.Driver"</span><span
class="p">,</span><span class="w">
- </span><span class="nl">"url"</span><span class="p">:</span><span class="w">
</span><span class="s2">"jdbc:mysql://1.2.3.4"</span><span
class="p">,</span><span class="w">
- </span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"user"</span><span class="p">,</span><span
class="w">
- </span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"password"</span><span class="w">
-</span><span class="p">}</span><span class="w">
+ </span><span class="s2">"driver:"</span><span class="w"> </span><span
class="s2">"oracle.jdbc.OracleDriver"</span><span class="p">,</span><span
class="w">
+ </span><span class="s2">"url:"</span><span class="w"> </span><span
class="s2">"jdbc:oracle:thin:user/[email protected]:1521/ORCL"</span><span
class="w">
+</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
-<h3 id="example-postgresql-configuration">Example PostgreSQL Configuration</h3>
+<h3 id="example-postgresql-configuration">Example PostgreSQL configuration</h3>
<p>Drill is tested with the PostgreSQL driver version <a
href="https://mvnrepository.com/artifact/org.postgresql/postgresql">42.2.11</a>
(any recent driver should work).
Download and copy this driver jar to the <code class="language-plaintext
highlighter-rouge">jars/3rdparty</code> folder on all nodes.</p>
@@ -1560,19 +1555,19 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
</span><span class="nl">"url"</span><span class="p">:</span><span class="w">
</span><span class="s2">"jdbc:postgresql://1.2.3.4/mydatabase"</span><span
class="p">,</span><span class="w">
</span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"user"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"password"</span><span class="w">
-</span><span class="p">}</span><span class="w">
+</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
<p>You may need to qualify a table name with a schema name for Drill to return
data. For example, when querying a table named ips, you must issue the query
against public.ips, as shown in the following example:</p>
-<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre
class="highlight"><code> 0: jdbc:drill:zk=local> use pgdb;
+<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre
class="highlight"><code> 0: jdbc:drill:zk=local> use pgdb;
|------|----------------------------------|
| ok | summary |
|------|----------------------------------|
| true | Default schema changed to [pgdb] |
|------|----------------------------------|
-
- 0: jdbc:drill:zk=local> show tables;
+
+ 0: jdbc:drill:zk=local> show tables;
|--------------|--------------|
| TABLE_SCHEMA | TABLE_NAME |
|--------------|--------------|
@@ -1581,7 +1576,7 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
| pgdb.test | pg_am |
|--------------|--------------|
- 0: jdbc:drill:zk=local> select * from public.ips;
+ 0: jdbc:drill:zk=local> select * from public.ips;
|------|---------|
| ipid | ipv4dot |
|------|---------|
@@ -1590,7 +1585,7 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
|------|---------|
</code></pre></div></div>
-<h3
id="example-of-postgresql-configuration-with-sourceparameters-configuration-property">Example
of PostgreSQL Configuration with <code class="language-plaintext
highlighter-rouge">sourceParameters</code> configuration property</h3>
+<h3
id="example-of-postgresql-configuration-with-sourceparameters-configuration-property">Example
of PostgreSQL configuration with <code class="language-plaintext
highlighter-rouge">sourceParameters</code> configuration property</h3>
<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
</span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
</span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
@@ -1605,9 +1600,28 @@ Each configuration registered with Drill must have a
distinct name. Names are ca
</span><span class="nl">"dataSource.cachePrepStmts"</span><span
class="p">:</span><span class="w"> </span><span class="kc">true</span><span
class="p">,</span><span class="w">
</span><span class="nl">"dataSource.prepStmtCacheSize"</span><span
class="p">:</span><span class="w"> </span><span class="mi">250</span><span
class="w">
</span><span class="p">}</span><span class="w">
-</span><span class="p">}</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div></div>
+
+<h3 id="example-sql-server-configuration">Example SQL Server configuration</h3>
+
+<p>For SQL Server, Drill has been tested with Microsoft’s <a
href="https://www.microsoft.com/en-US/download/details.aspx?id=11774">sqljdbc41.4.2.6420.100.jar</a>
driver. Copy this jar file to all Drillbits.</p>
+
+<div class="admonition note">
+ <p class="first admonition-title">Note</p>
+ <p class="last">You'll need to provide a database name as part of your JDBC
connection string for Drill to correctly expose MSSQL schemas. </p>
+</div>
+<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"jdbc"</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"enabled"</span><span class="p">:</span><span
class="w"> </span><span class="kc">true</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"driver"</span><span class="p">:</span><span
class="w"> </span><span
class="s2">"com.microsoft.sqlserver.jdbc.SQLServerDriver"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"url"</span><span class="p">:</span><span class="w">
</span><span
class="s2">"jdbc:sqlserver://1.2.3.4:1433;databaseName=mydatabase"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"username"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"user"</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"password"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"password"</span><span class="w">
+</span><span class="p">}</span><span class="w">
</span></code></pre></div></div>
+
<div class="doc-nav">
diff --git a/output/zh/docs/s3-storage-plugin/index.html
b/output/zh/docs/s3-storage-plugin/index.html
index 1a44457..9792757 100644
--- a/output/zh/docs/s3-storage-plugin/index.html
+++ b/output/zh/docs/s3-storage-plugin/index.html
@@ -1478,7 +1478,7 @@
<name>fs.s3a.endpoint</name>
<value>s3.REGION.amazonaws.com</value>
</property>
- </configuration>
+ </configuration>
</code></pre></div></div>
<h3 id="configuring-drill-to-use-aws-iam-roles-for-accessing-s3">Configuring
Drill to use AWS IAM Roles for Accessing S3</h3>
@@ -1490,7 +1490,7 @@
<name>fs.s3a.aws.credentials.provider</name>
<value>com.amazonaws.auth.InstanceProfileCredentialsProvider</value>
</property>
- </configuration>
+ </configuration>
</code></pre></div></div>
<h2 id="configuring-the-s3-storage-plugin">Configuring the S3 Storage
Plugin</h2>
@@ -1499,7 +1499,7 @@
<p>To configure the S3 storage plugin, log in to the Drill Web UI at <code
class="language-plaintext
highlighter-rouge">http://<drill-hostname>:8047</code>. The <code
class="language-plaintext highlighter-rouge">drill-hostname</code> is a node on
which Drill is running. Go to the <strong>Storage</strong> page and click
<strong>Update</strong> next to the S3 storage plugin option.</p>
-<p><strong>Note:</strong> The <code class="language-plaintext
highlighter-rouge">"config"</code> block in the S3 storage plugin configuration
contains properties to define your AWS credentials. Do not include the <code
class="language-plaintext highlighter-rouge">"config"</code> block in your S3
storage plugin configuration if you defined your AWS credentials in the <code
class="language-plaintext highlighter-rouge">core-site.xml</code> file.</p>
+<p>*Note:** The <code class="language-plaintext
highlighter-rouge">"config"</code> block in the S3 storage plugin configuration
contains properties to define your AWS credentials. Do not include the <code
class="language-plaintext highlighter-rouge">"config"</code> block in your S3
storage plugin configuration if you defined your AWS credentials in the <code
class="language-plaintext highlighter-rouge">core-site.xml</code> file.</p>
<p>Configure the S3 storage plugin configuration to use an external provider
for credentials or directly add the credentials in the configuration itself, as
described in the following sections. Click <strong>Update</strong> to save the
configuration when done.</p>
@@ -1512,7 +1512,7 @@
<p>For subsequent connections, if you want Drill to connect using different
credentials, you can include the <code class="language-plaintext
highlighter-rouge">fs.s3a.impl.disable.cache</code> property in the
configuration. See <a
href="/zh/docs/s3-storage-plugin/#reconnecting-to-an-s3-bucket-using-different-credentials">Reconnecting
to an S3 Bucket Using Different Credentials</a> for more information.</p>
-<p><strong>Configuring the S3 Plugin to use an External Provider</strong><br />
+<p><strong>Configuring the S3 Plugin to use an External Provider</strong>
Add the bucket name and the <code class="language-plaintext
highlighter-rouge">hadoop.security.credential.provider.path</code> property to
the S3 storage plugin configuration. The <code class="language-plaintext
highlighter-rouge">hadoop.security.credential.provider.path</code> property
should point to a file that contains your encrypted passwords. Optionally,
include the <code class="language-plaintext
highlighter-rouge">hadoop.security.credential.clear-text-fallback</code>
property for [...]
<p>The following example shows an S3 storage plugin configuration with the S3
bucket, <code class="language-plaintext
highlighter-rouge">hadoop.security.credential.provider.path</code>, and <code
class="language-plaintext highlighter-rouge">fs.s3a.impl.disable.cache
properties</code> set:</p>
@@ -1528,7 +1528,7 @@ Add the bucket name and the <code
class="language-plaintext highlighter-rouge">h
},
"workspaces": {
...
- }
+ }
</code></pre></div></div>
<h3 id="adding-credentials-directly-to-the-s3-plugin">Adding Credentials
Directly to the S3 Plugin</h3>
@@ -1549,7 +1549,7 @@ Add the bucket name and the <code
class="language-plaintext highlighter-rouge">h
"fs.s3a.impl.disable.cache":"true"
},
"workspaces": {...
- },
+ },
</code></pre></div></div>
<h3 id="reconnecting-to-an-s3-bucket-using-different-credentials">Reconnecting
to an S3 Bucket Using Different Credentials</h3>
@@ -1579,15 +1579,27 @@ Add the bucket name and the <code
class="language-plaintext highlighter-rouge">h
<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre
class="highlight"><code> <configuration>
...
-
+
<property>
<name>fs.s3a.connection.maximum</name>
<value>100</value>
</property>
-
+
</configuration>
</code></pre></div></div>
+<h2 id="public-s3-buckets">Public S3 buckets</h2>
+<p>To query a data in a public S3 bucket, specify the anonymous AWS
credentials provider as is done in the following example based on the public
NYC taxi data bucket.</p>
+
+<div class="language-json highlighter-rouge"><div class="highlight"><pre
class="highlight"><code><span class="p">{</span><span class="w">
+ </span><span class="nl">"type"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"file"</span><span class="p">,</span><span
class="w">
+ </span><span class="nl">"connection"</span><span class="p">:</span><span
class="w"> </span><span class="s2">"s3a://nyc-tlc"</span><span
class="p">,</span><span class="w">
+ </span><span class="nl">"config"</span><span class="p">:</span><span
class="w"> </span><span class="p">{</span><span class="w">
+ </span><span class="nl">"fs.s3a.aws.credentials.provider"</span><span
class="p">:</span><span class="w"> </span><span
class="s2">"org.apache.hadoop.fs.s3a.AnonymousAWSCredentialsProvider"</span><span
class="w">
+ </span><span class="p">},</span><span class="w">
+ </span><span class="err">...</span><span class="w">
+</span><span class="p">}</span><span class="w">
+</span></code></pre></div></div>
diff --git a/output/zh/feed.xml b/output/zh/feed.xml
index fc6dd9e..5521b92 100644
--- a/output/zh/feed.xml
+++ b/output/zh/feed.xml
@@ -6,8 +6,8 @@
</description>
<link>/</link>
<atom:link href="/zh/feed.xml" rel="self" type="application/rss+xml"/>
- <pubDate>Wed, 17 Nov 2021 16:55:54 +0000</pubDate>
- <lastBuildDate>Wed, 17 Nov 2021 16:55:54 +0000</lastBuildDate>
+ <pubDate>Wed, 24 Nov 2021 10:14:19 +0000</pubDate>
+ <lastBuildDate>Wed, 24 Nov 2021 10:14:19 +0000</lastBuildDate>
<generator>Jekyll v3.9.1</generator>
<item>