You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by mi...@apache.org on 2022/11/16 22:15:24 UTC
[impala] branch master updated (c95342669 -> c3ec9272c)
This is an automated email from the ASF dual-hosted git repository.
michaelsmith pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
from c95342669 IMPALA-11683: Support Aliyun OSS File System
new e1e92da79 IMPALA-11676: Prettify asf-site docs
new c3ec9272c IMPALA-11724: Use CDP Ozone in test environment
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE.txt | 2 +
bin/bootstrap_toolchain.py | 3 +-
bin/impala-config.sh | 17 +--
bin/rat_exclude_files.txt | 2 +
docs/Makefile | 15 ++-
docs/build-doc.sh | 19 +++-
docs/css/dita-ot-doc.css | 268 +++++++++++++++++++++++++++++++++++++++++++++
docs/impala.ditamap | 4 +-
docs/shared/header.xml | 15 +++
java/executor-deps/pom.xml | 4 +-
java/pom.xml | 2 -
11 files changed, 320 insertions(+), 31 deletions(-)
create mode 100644 docs/css/dita-ot-doc.css
create mode 100644 docs/shared/header.xml
[impala] 01/02: IMPALA-11676: Prettify asf-site docs
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit e1e92da796d27ce519e2919f8b6ae9d930561519
Author: Tamas Mate <tm...@apache.org>
AuthorDate: Mon Nov 14 13:03:26 2022 +0100
IMPALA-11676: Prettify asf-site docs
This commit refactors and adds a new build option to the docs build
script/Makefile, these options are:
- plain-html: the plain html docs, without css and navigation bar, this
was "the" html build before this change.
- asf-site-html: html docs, with css and navigation bar.
- pdf
The css is comming from DITA project's documentation.
Testing:
- Built the docs and tested the pages manually.
Change-Id: Ic9621cb0abaa7fd9bf445da08440c0f6a9788180
Reviewed-on: http://gerrit.cloudera.org:8080/19242
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
LICENSE.txt | 2 +
bin/rat_exclude_files.txt | 2 +
docs/Makefile | 15 ++-
docs/build-doc.sh | 19 +++-
docs/css/dita-ot-doc.css | 268 ++++++++++++++++++++++++++++++++++++++++++++++
docs/impala.ditamap | 4 +-
docs/shared/header.xml | 15 +++
7 files changed, 315 insertions(+), 10 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index b6eb55aeb..cc865b4cd 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -672,6 +672,8 @@ be/src/thirdparty/pcg-cpp-0.98: Apache 2.0 license
be/src/expr/hll-bias.h: Apache 2.0 license
shell/ext-py/sasl-0.2.1: Apache 2.0 license
shell/ext-py/thrift_sasl-0.4.2: Apache 2.0 license
+docs/css/dita-ot-doc.css: Apache 2.0 license
+docs/shared/header.xml: Apache 2.0 license
--------------------------------------------------------------------------------
diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt
index f0d97e80e..ff1853c83 100644
--- a/bin/rat_exclude_files.txt
+++ b/bin/rat_exclude_files.txt
@@ -92,6 +92,8 @@ be/src/util/cache/cache-test.h
be/src/util/cache/cache-test.cc
be/src/util/cache/rl-cache.cc
be/src/util/cache/rl-cache-test.cc
+docs/css/dita-ot-doc.css
+docs/shared/header.xml
# http://www.apache.org/legal/src-headers.html: "Short informational text files; for
# example README, INSTALL files. The expectation is that these files make it obvious which
diff --git a/docs/Makefile b/docs/Makefile
index 837a3368c..2904fd0ee 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -15,18 +15,23 @@
# specific language governing permissions and limitations
# under the License.
-.PHONY: all html pdf
+.PHONY: all plain-html asf-site-html pdf
-all: html pdf
+all: plain-html asf-site-html pdf
-html: build/html/index.html
+plain-html: build/plain-html/index.html
+
+asf-site-html: build/asf-site-html/index.html
pdf: build/impala.pdf
ALL_DEPS=Makefile impala.ditamap shared/*.xml images/* topics/*.xml
-build/html/index.html: impala_html.ditaval ${ALL_DEPS}
- ./build-doc.sh xhtml $(dir $@) $< gen-html.log
+build/plain-html/index.html: impala_html.ditaval ${ALL_DEPS}
+ ./build-doc.sh xhtml $(dir $@) $< gen-plain-html.log
+
+build/asf-site-html/index.html: impala_html.ditaval ${ALL_DEPS}
+ ./build-doc.sh html5 $(dir $@) $< gen-asf-site-html.log --pretty
build/impala.pdf: impala_pdf.ditaval ${ALL_DEPS}
./build-doc.sh pdf $(dir $@) $< gen-pdf.log
diff --git a/docs/build-doc.sh b/docs/build-doc.sh
index 6153e1da6..e86b5bee3 100755
--- a/docs/build-doc.sh
+++ b/docs/build-doc.sh
@@ -20,17 +20,30 @@
set -euo pipefail
function usage() {
- echo "$0 <file_format> <output_file> <filter_file> <log_file>"
+ echo "$0 <file_format> <output_file> <filter_file> <log_file> [--pretty]"
exit 1
}
-[[ $# -eq 4 ]] || usage
+[[ $# -eq 4 || $# -eq 5 ]] || usage
FILE_FORMAT=$1
OUTPUT_FILE=$2
FILTER_FILE=$3
LOG_FILE=$4
-dita -i impala.ditamap -f ${FILE_FORMAT} -o ${OUTPUT_FILE} -filter ${FILTER_FILE} 2>&1 \
+if [[ $# -eq 4 || $5 != "--pretty" ]]; then
+ dita -i impala.ditamap -f ${FILE_FORMAT} -o ${OUTPUT_FILE} -filter ${FILTER_FILE} 2>&1 \
| tee ${LOG_FILE}
+else
+ dita -i impala.ditamap -f ${FILE_FORMAT} -o ${OUTPUT_FILE} \
+ -Dnav-toc=partial \
+ -Dargs.copycss=yes \
+ -Dargs.csspath=css \
+ -Dargs.cssroot=$PWD/css \
+ -Dargs.css=dita-ot-doc.css \
+ -Dargs.hdr=$PWD/shared/header.xml \
+ -filter ${FILTER_FILE} 2>&1 \
+ | tee ${LOG_FILE}
+fi
+
[[ -z $(grep "\[ERROR\]" ${LOG_FILE}) ]] || exit 1
diff --git a/docs/css/dita-ot-doc.css b/docs/css/dita-ot-doc.css
new file mode 100644
index 000000000..a8114a4e7
--- /dev/null
+++ b/docs/css/dita-ot-doc.css
@@ -0,0 +1,268 @@
+/*************************************************************
+The DITA Open Toolkit is licensed for use under the the Apache
+Software Foundation License v2.0.
+
+A copy of the Apache Software Foundation License 2.0 is
+available at http://opensource.org/licenses/apache2.0.php
+
+This statement must be included in any copies of DITA Open
+Toolkit code.
+*************************************************************/
+
+/* DITA Open Toolkit documentation style */
+
+/*************************************************************
+Basic fonts and typography
+*************************************************************/
+
+article {
+ color: #333;
+}
+
+body {
+ background-color: white;
+ background-image: -webkit-linear-gradient(left, #eee 0%, #fff 300px); /* Chrome10+,Safari5.1+ */
+ background-image: -moz-linear-gradient(left, #eee 0%, #fff 300px); /* FF3.6+ */
+ background-image: linear-gradient(left, #eee 0%, #fff 300px); /* W3C */
+ color: #333;
+ margin: 0;
+ padding: 1em;
+}
+
+div.header {
+ font-size: 18pt;
+ margin: 0;
+ padding: 0 12px;
+}
+
+div.header p {
+ color: #777;
+ font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ line-height: 1.3;
+ margin: 0;
+}
+
+div.header hr {
+ border: 0;
+ border-bottom: 1px solid #eee;
+ height: 0;
+}
+
+body,
+caption,
+td,
+th {
+ font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ font-size: 10pt;
+}
+
+code,
+pre,
+.cmdname,
+.filepath,
+.msgnum,
+.option,
+.parmname {
+ color: #777;
+ font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
+ font-size: 90%;
+}
+
+/*************************************************************
+Headings
+*************************************************************/
+
+h1,
+h2,
+h3 {
+ color: #1d365d;
+ font-size: 12pt;
+ font-weight: bold;
+ margin-bottom: 0.75em;
+ margin-left: 0;
+ margin-right: 0;
+ margin-top: 1em;
+ padding: 0;
+}
+
+h1 .filepath,
+h2 .filepath,
+h3 .filepath {
+ font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ font-size: 12pt;
+ font-weight: bold;
+}
+
+h1 .filepath {
+ color: #1d365d;
+}
+
+.sectiontitle {
+ color: #1d365d;
+ font-weight: bold;
+}
+
+.topictitle1 {
+ margin-top: 1em;
+}
+
+/*************************************************************
+Basic identation, padding, and margins
+*************************************************************/
+
+main {
+ margin-left: 300px;
+}
+
+blockquote,
+li,
+p {
+ line-height: 125%;
+ margin-bottom: 0.75em;
+ margin-left: 0;
+ margin-right: 0;
+ margin-top: 0.75em;
+ padding: 0;
+}
+
+dd {
+ line-height: 125%;
+ margin-bottom: 0.75em;
+ margin-top: 0.75em;
+}
+
+dl {
+ line-height: 125%;
+ margin-bottom: 0.75em;
+ margin-left: 2em;
+ margin-right: 0;
+ margin-top: 0.75em;
+ padding: 0;
+}
+
+ol,
+ul {
+ margin-bottom: 0.75em;
+ margin-left: 2em;
+ margin-right: 0;
+ margin-top: 0.75em;
+ padding: 0;
+}
+
+pre {
+ margin-bottom: 0.75em;
+ margin-left: 2em;
+ margin-top: 0.75em;
+ padding: 0;
+}
+
+/*************************************************************
+Block elements
+*************************************************************/
+
+.codeblock,
+.screen {
+ background-color: #eee;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ padding: 6px;
+}
+
+/*************************************************************
+Figures
+*************************************************************/
+
+figcaption {
+ font-style: italic;
+}
+
+/*************************************************************
+In-line elements
+*************************************************************/
+
+.cmdname,
+.msgnum {
+ font-weight: bold;
+}
+
+/*************************************************************
+Links
+*************************************************************/
+
+a:link {
+ color: #3563ab;
+ text-decoration: none;
+}
+
+a:visited {
+ color: #3563ab;
+}
+
+a:active,
+a:hover {
+ color: #1d365d;
+ text-decoration: underline;
+}
+
+.related-links {
+ color: #555;
+}
+
+.linklist {
+ margin-top: 1em;
+}
+
+/*************************************************************
+Notes
+*************************************************************/
+
+.note {
+ line-height: 125%;
+ margin-left: 2em;
+ margin-right: 0;
+ padding: 0;
+}
+
+.caution,
+.notelisttitle,
+.note__title {
+ font-weight: bold;
+}
+
+/*************************************************************
+Tables
+*************************************************************/
+
+table {
+ border-color: Silver;
+ border-style: solid;
+ border-width: 1px;
+ margin-bottom: 1em;
+ margin-top: 1em;
+ padding: 1px;
+}
+
+tr {
+ border-color: Silver;
+}
+
+td {
+ border-color: Silver;
+}
+
+th {
+ background-color: #eee;
+}
+
+/*************************************************************
+Navigation
+*************************************************************/
+
+nav[role=toc] {
+ float: left;
+ width: 300px;
+}
+
+nav[role=toc] li.active > a {
+ font-weight: bold;
+}
diff --git a/docs/impala.ditamap b/docs/impala.ditamap
index 6d046e132..7eac4c329 100644
--- a/docs/impala.ditamap
+++ b/docs/impala.ditamap
@@ -46,11 +46,11 @@ under the License.
<topicref href="topics/impala_hadoop.xml"/>
</topicref>
<topicref href="topics/impala_planning.xml">
- <topicref href="topics/impala_prereqs.xml#prereqs"/>
+ <topicref href="topics/impala_prereqs.xml"/>
<!-- Removed per Alan Choi's request on 4/18/2018 <topicref href="topics/impala_cluster_sizing.xml"/> -->
<topicref href="topics/impala_schema_design.xml"/>
</topicref>
- <topicref audience="standalone" href="topics/impala_install.xml#install">
+ <topicref audience="standalone" href="topics/impala_install.xml">
<!-- Removed when Hue docs were removed from main library. Might be worth resurrecting someday as general Impala+Hue topic. -->
<!-- <topicref href="impala_hue_xi20559.xml"/> -->
</topicref>
diff --git a/docs/shared/header.xml b/docs/shared/header.xml
new file mode 100644
index 000000000..fbc8d0e91
--- /dev/null
+++ b/docs/shared/header.xml
@@ -0,0 +1,15 @@
+<!--
+The DITA Open Toolkit is licensed for use under the the Apache
+Software Foundation License v2.0.
+
+A copy of the Apache Software Foundation License 2.0 is
+available at http://opensource.org/licenses/apache2.0.php
+
+This statement must be included in any copies of DITA Open
+Toolkit code.
+-->
+
+<div class="header">
+ <p>Apache Impala</p>
+ <hr/>
+</div>
[impala] 02/02: IMPALA-11724: Use CDP Ozone in test environment
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit c3ec9272c591624e8dfc130a85c98da318735f14
Author: Michael Smith <mi...@cloudera.com>
AuthorDate: Mon Nov 14 13:26:21 2022 -0800
IMPALA-11724: Use CDP Ozone in test environment
Updates the test environment to default to the CDP build of Ozone, as
the latest build of CDP Hive depends on pre-release features unavailable
in Ozone 1.2.1. Apache Ozone 1.2 can still be used by setting
USE_APACHE_OZONE=true.
The latest CDP build also includes a version of Ozone based on
ozone#master with a candidate version of 1.3.0. Both Apache and CDP
therefore have builds of Ozone we can test with that use the new
artifact names introduced in Ozone 1.2, so this patch cleans up setup
that was only needed for Ozone versions prior to 1.2.
Change-Id: I1177a1b820fe21adca9f8c1cc51ff73ee001d3f2
Reviewed-on: http://gerrit.cloudera.org:8080/19247
Reviewed-by: Joe McDonnell <jo...@cloudera.com>
Tested-by: Michael Smith <mi...@cloudera.com>
---
bin/bootstrap_toolchain.py | 3 +--
bin/impala-config.sh | 17 ++---------------
java/executor-deps/pom.xml | 4 ++--
java/pom.xml | 2 --
4 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/bin/bootstrap_toolchain.py b/bin/bootstrap_toolchain.py
index e6c4d0423..7e8371a4d 100755
--- a/bin/bootstrap_toolchain.py
+++ b/bin/bootstrap_toolchain.py
@@ -517,8 +517,7 @@ def get_hadoop_downloads():
if use_apache_ozone:
ozone = ApacheComponent("ozone", component_path_tmpl="ozone/${version}")
else:
- ozone = CdpComponent("ozone", archive_basename_tmpl="hadoop-ozone-${version}",
- unpack_directory_tmpl="ozone-${version}")
+ ozone = CdpComponent("ozone")
use_apache_hive = os.environ["USE_APACHE_HIVE"] == "true"
if use_apache_hive:
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 188f21879..a8eb649bd 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -349,28 +349,15 @@ if [[ "${IMPALA_HIVE_MAJOR_VERSION}" == "1" ||
return 1
fi
-# Defaults to Apache because Ozone in newer CDP releases is currently unmaintained
-export USE_APACHE_OZONE=${USE_APACHE_OZONE-true}
+export USE_APACHE_OZONE=${USE_APACHE_OZONE-false}
if $USE_APACHE_OZONE; then
- export IMPALA_OZONE_DIST_TYPE="apache-ozone"
export IMPALA_OZONE_VERSION=${APACHE_OZONE_VERSION}
export IMPALA_OZONE_URL=${APACHE_OZONE_URL-}
else
- export IMPALA_OZONE_DIST_TYPE="ozone"
export IMPALA_OZONE_VERSION=${CDP_OZONE_VERSION}
export IMPALA_OZONE_URL=${CDP_OZONE_URL-}
fi
-# Ozone changed jar groupId and artifactId in Ozone 1.2
-export IMPALA_OZONE_MINOR_VERSION=$(echo "$IMPALA_OZONE_VERSION" | cut -d . -f 2)
-if [[ ${IMPALA_OZONE_MINOR_VERSION} < 2 ]]; then
- export IMPALA_OZONE_JAR_GROUP_ID="org.apache.hadoop"
- export IMPALA_OZONE_JAR_ARTIFACT_ID="hadoop-ozone-filesystem-hadoop3"
-else
- export IMPALA_OZONE_JAR_GROUP_ID="org.apache.ozone"
- export IMPALA_OZONE_JAR_ARTIFACT_ID="ozone-filesystem-hadoop3"
-fi
-
# It is important to have a coherent view of the JAVA_HOME and JAVA executable.
# The JAVA_HOME should be determined first, then the JAVA executable should be
# derived from JAVA_HOME. bin/bootstrap_development.sh adds code to
@@ -797,7 +784,7 @@ export HADOOP_LIB_DIR=${HADOOP_LIB_DIR_OVERRIDE:-"${HADOOP_HOME}/lib"}
export HADOOP_CLASSPATH="${HADOOP_CLASSPATH-}"
# Add Ozone Hadoop filesystem implementation when using Ozone
if [ "${TARGET_FILESYSTEM}" = "ozone" ]; then
- OZONE_JAR="${IMPALA_OZONE_JAR_ARTIFACT_ID}-${IMPALA_OZONE_VERSION}.jar"
+ OZONE_JAR="ozone-filesystem-hadoop3-${IMPALA_OZONE_VERSION}.jar"
HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${OZONE_HOME}/share/ozone/lib/${OZONE_JAR}"
fi
# Add the path containing the hadoop-aws jar, which is required to access AWS from the
diff --git a/java/executor-deps/pom.xml b/java/executor-deps/pom.xml
index 4f1ea5029..bf607480f 100644
--- a/java/executor-deps/pom.xml
+++ b/java/executor-deps/pom.xml
@@ -158,8 +158,8 @@ under the License.
</dependency>
<dependency>
- <groupId>${ozone.groupId}</groupId>
- <artifactId>${ozone.artifactId}</artifactId>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-filesystem-hadoop3</artifactId>
<version>${ozone.version}</version>
<!-- Remove all transitive dependencies from the Apache Ozone dependency.
ozone-filesystem-hadoop3 is a shaded-jar, which already includes
diff --git a/java/pom.xml b/java/pom.xml
index 41ce4f0a7..20e26adf2 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -46,8 +46,6 @@ under the License.
<hbase.version>${env.IMPALA_HBASE_VERSION}</hbase.version>
<avro.version>${env.IMPALA_AVRO_JAVA_VERSION}</avro.version>
<orc.version>${env.IMPALA_ORC_JAVA_VERSION}</orc.version>
- <ozone.groupId>${env.IMPALA_OZONE_JAR_GROUP_ID}</ozone.groupId>
- <ozone.artifactId>${env.IMPALA_OZONE_JAR_ARTIFACT_ID}</ozone.artifactId>
<ozone.version>${env.IMPALA_OZONE_VERSION}</ozone.version>
<parquet.version>${env.IMPALA_PARQUET_VERSION}</parquet.version>
<kite.version>${env.IMPALA_KITE_VERSION}</kite.version>