You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2021/08/25 05:35:35 UTC

[incubator-kyuubi] branch master updated: [KYUUBI #976] [BUILD] Fix source release build

This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new d58a092  [KYUUBI #976] [BUILD] Fix source release build
d58a092 is described below

commit d58a09224522b537dc4562a191812415f279f542
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Wed Aug 25 13:35:25 2021 +0800

    [KYUUBI #976] [BUILD] Fix source release build
    
    <!--
    Thanks for sending a pull request!
    
    Here are some tips for you:
      1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
      2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
      3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
    -->
    
    ### _Why are the changes needed?_
    <!--
    Please clarify why the changes are needed. For instance,
      1. If you add a feature, you can talk about the use case of it.
      2. If you fix a bug, you can clarify why it is a bug.
    -->
    Support build, run unit tests, and create binary tarball from source release.
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
    
    - [ ] Add screenshots for manual tests if appropriate
    
    - [ ] [Run test](https://kyuubi.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request
    
    The verify steps:
    
    1. create a source release tarball
    ```
    RELEASE_VERSION=1.4.0-SNAPSHOT build/release/create-package.sh source
    ```
    2. untar tarball
    ```
    cd work/release
    tar -xzf kyuubi-1.4.0-SNAPSHOT-bin.tgz
    cd kyuubi-1.4.0-SNAPSHOT-bin
    ```
    3. compile and run unit test
    ```
    build/mvn clean install
    ```
    4. create binary release tarball
    ```
    build/dist --tgz --spark-provided -Pkyuubi-extension-spark-3-1
    ```
    
    Closes #976 from pan3793/source-build.
    
    Closes #976
    
    354968ae [Cheng Pan] Compress imgs
    9c47b64f [Cheng Pan] Restore docs/imgs in source release
    5d86ecc7 [Cheng Pan] Clean up imgs
    a3399279 [Cheng Pan] Support create binary from source release
    bb279863 [Cheng Pan] [BUILD] Fix source release ut failures
    
    Authored-by: Cheng Pan <ch...@apache.org>
    Signed-off-by: Cheng Pan <ch...@apache.org>
---
 .gitattributes                                     |   1 -
 build/dist                                         |   8 +++++---
 docs/community/release.md                          |   2 --
 docs/imgs/datagrid_driver_setting.png              | Bin 222318 -> 0 bytes
 docs/imgs/datagrip/driver_setting.png              | Bin 0 -> 75234 bytes
 docs/imgs/datagrip_driver_setting.png              | Bin 251244 -> 0 bytes
 docs/imgs/dbeaver/connected.png                    | Bin 72721 -> 17478 bytes
 docs/imgs/dbeaver/dbeaver_connnect_to_database.png | Bin 612313 -> 146299 bytes
 .../dbeaver_connnect_to_database_connection.png    | Bin 439531 -> 120468 bytes
 .../dbeaver_connnect_to_database_driver.png        | Bin 614074 -> 119670 bytes
 .../dbeaver/dbeaver_connnect_to_database_port.png  | Bin 489370 -> 133784 bytes
 docs/imgs/dbeaver/desc_database.png                | Bin 1604543 -> 389808 bytes
 docs/imgs/dbeaver/download_driver.png              | Bin 637684 -> 121709 bytes
 docs/imgs/dbeaver/metadata.png                     | Bin 1532164 -> 396949 bytes
 docs/imgs/dbeaver/query.png                        | Bin 1515498 -> 384802 bytes
 docs/imgs/dbeaver/query41_result.png               | Bin 2141960 -> 555745 bytes
 docs/imgs/dbeaver/tpcds_schema.png                 | Bin 471638 -> 95662 bytes
 docs/imgs/dbeaver/viewdata.png                     | Bin 2732591 -> 778197 bytes
 docs/imgs/ha.png                                   | Bin 213589 -> 28507 bytes
 docs/imgs/idea_debug.png                           | Bin 234384 -> 64079 bytes
 docs/imgs/impersonation.png                        | Bin 97597 -> 24537 bytes
 docs/imgs/kyuubi.png                               | Bin 396652 -> 129424 bytes
 docs/imgs/kyuubi_architecture.png                  | Bin 211627 -> 53855 bytes
 docs/imgs/kyuubi_architecture_new.png              | Bin 490275 -> 127660 bytes
 docs/imgs/kyuubi_ecosystem.png                     | Bin 735627 -> 91557 bytes
 docs/imgs/kyuubi_internal.png                      | Bin 64321 -> 19316 bytes
 docs/imgs/kyuubi_layers.png                        | Bin 661028 -> 36471 bytes
 docs/imgs/kyuubi_migrating_yarn_to_k8s.png         | Bin 377730 -> 36492 bytes
 docs/imgs/kyuubi_positioning.png                   | Bin 190044 -> 46688 bytes
 docs/imgs/logo/Iceberg-logo.png                    | Bin 11068 -> 0 bytes
 docs/imgs/logo/beaver-head.png                     | Bin 7565 -> 0 bytes
 docs/imgs/logo/hadoop-logo.jpg                     | Bin 16389 -> 0 bytes
 docs/imgs/logo/hadoop-yarn-logo.png                | Bin 25239 -> 0 bytes
 docs/imgs/logo/hue-logo.svg                        |  14 --------------
 docs/imgs/logo/spark-logo-trademark.png            | Bin 26999 -> 0 bytes
 docs/imgs/logo/squirrel.jpg                        | Bin 17091 -> 0 bytes
 docs/imgs/release/release-process.png              | Bin 363329 -> 0 bytes
 docs/imgs/spark/hang.png                           | Bin 48377 -> 18064 bytes
 docs/imgs/spark/sts.png                            | Bin 216284 -> 56068 bytes
 docs/imgs/spark_jobs_page.png                      | Bin 206958 -> 69593 bytes
 40 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 1e3eb76..6e2eb12 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,7 +22,6 @@
 _config.yml export-ignore
 codecov.yml export-ignore
 dev/kyuubi-tpcds/ export-ignore
-docs/ export-ignore
 licenses-binary/ export-ignore
 LICENSE-binary export-ignore
 NOTICE-binary export-ignore
diff --git a/build/dist b/build/dist
index aed4dbe..8fbb3bf 100755
--- a/build/dist
+++ b/build/dist
@@ -217,9 +217,11 @@ fi
 
 # Copy license files
 cp "$KYUUBI_HOME/DISCLAIMER" "$DISTDIR/DISCLAIMER"
-cp "$KYUUBI_HOME/LICENSE-binary" "$DISTDIR/LICENSE"
-cp -r "$KYUUBI_HOME/licenses-binary" "$DISTDIR/licenses"
-$KYUUBI_HOME/build/release/collect-licenses.sh "$DISTDIR" "$DISTDIR"
+if [[ -f $"$KYUUBI_HOME/LICENSE-binary" ]]; then
+  cp "$KYUUBI_HOME/LICENSE-binary" "$DISTDIR/LICENSE"
+  cp -r "$KYUUBI_HOME/licenses-binary" "$DISTDIR/licenses"
+  $KYUUBI_HOME/build/release/collect-licenses.sh "$DISTDIR" "$DISTDIR"
+fi
 
 cp -r "$KYUUBI_HOME/bin" "$DISTDIR"
 cp -r "$KYUUBI_HOME/conf" "$DISTDIR"
diff --git a/docs/community/release.md b/docs/community/release.md
index ab05a60..363b918 100644
--- a/docs/community/release.md
+++ b/docs/community/release.md
@@ -38,8 +38,6 @@ Please remember that publishing software has legal consequences. This guide comp
 
 ### Overview
 
-![release process](../imgs/release/release-process.png)
-
 The release process consists of several steps:
 
 1. Decide to release
diff --git a/docs/imgs/datagrid_driver_setting.png b/docs/imgs/datagrid_driver_setting.png
deleted file mode 100644
index f9008dd..0000000
Binary files a/docs/imgs/datagrid_driver_setting.png and /dev/null differ
diff --git a/docs/imgs/datagrip/driver_setting.png b/docs/imgs/datagrip/driver_setting.png
new file mode 100644
index 0000000..45a852c
Binary files /dev/null and b/docs/imgs/datagrip/driver_setting.png differ
diff --git a/docs/imgs/datagrip_driver_setting.png b/docs/imgs/datagrip_driver_setting.png
deleted file mode 100644
index 454233b..0000000
Binary files a/docs/imgs/datagrip_driver_setting.png and /dev/null differ
diff --git a/docs/imgs/dbeaver/connected.png b/docs/imgs/dbeaver/connected.png
index 7b9a0e1..372cf25 100644
Binary files a/docs/imgs/dbeaver/connected.png and b/docs/imgs/dbeaver/connected.png differ
diff --git a/docs/imgs/dbeaver/dbeaver_connnect_to_database.png b/docs/imgs/dbeaver/dbeaver_connnect_to_database.png
index dbaa523..9b8a2e4 100644
Binary files a/docs/imgs/dbeaver/dbeaver_connnect_to_database.png and b/docs/imgs/dbeaver/dbeaver_connnect_to_database.png differ
diff --git a/docs/imgs/dbeaver/dbeaver_connnect_to_database_connection.png b/docs/imgs/dbeaver/dbeaver_connnect_to_database_connection.png
index 6eee364..2442f4e 100644
Binary files a/docs/imgs/dbeaver/dbeaver_connnect_to_database_connection.png and b/docs/imgs/dbeaver/dbeaver_connnect_to_database_connection.png differ
diff --git a/docs/imgs/dbeaver/dbeaver_connnect_to_database_driver.png b/docs/imgs/dbeaver/dbeaver_connnect_to_database_driver.png
index d468b44..35442b8 100644
Binary files a/docs/imgs/dbeaver/dbeaver_connnect_to_database_driver.png and b/docs/imgs/dbeaver/dbeaver_connnect_to_database_driver.png differ
diff --git a/docs/imgs/dbeaver/dbeaver_connnect_to_database_port.png b/docs/imgs/dbeaver/dbeaver_connnect_to_database_port.png
index f1e0baa..15669f7 100644
Binary files a/docs/imgs/dbeaver/dbeaver_connnect_to_database_port.png and b/docs/imgs/dbeaver/dbeaver_connnect_to_database_port.png differ
diff --git a/docs/imgs/dbeaver/desc_database.png b/docs/imgs/dbeaver/desc_database.png
index 970e8cf..f4a18d0 100644
Binary files a/docs/imgs/dbeaver/desc_database.png and b/docs/imgs/dbeaver/desc_database.png differ
diff --git a/docs/imgs/dbeaver/download_driver.png b/docs/imgs/dbeaver/download_driver.png
index 7e1f405..d936da8 100644
Binary files a/docs/imgs/dbeaver/download_driver.png and b/docs/imgs/dbeaver/download_driver.png differ
diff --git a/docs/imgs/dbeaver/metadata.png b/docs/imgs/dbeaver/metadata.png
index 661530b..6d422bc 100644
Binary files a/docs/imgs/dbeaver/metadata.png and b/docs/imgs/dbeaver/metadata.png differ
diff --git a/docs/imgs/dbeaver/query.png b/docs/imgs/dbeaver/query.png
index 526258b..f21bd2d 100644
Binary files a/docs/imgs/dbeaver/query.png and b/docs/imgs/dbeaver/query.png differ
diff --git a/docs/imgs/dbeaver/query41_result.png b/docs/imgs/dbeaver/query41_result.png
index b037d07..bee75b9 100644
Binary files a/docs/imgs/dbeaver/query41_result.png and b/docs/imgs/dbeaver/query41_result.png differ
diff --git a/docs/imgs/dbeaver/tpcds_schema.png b/docs/imgs/dbeaver/tpcds_schema.png
index 1a73b14..b610c61 100644
Binary files a/docs/imgs/dbeaver/tpcds_schema.png and b/docs/imgs/dbeaver/tpcds_schema.png differ
diff --git a/docs/imgs/dbeaver/viewdata.png b/docs/imgs/dbeaver/viewdata.png
index 4f81486..4a0280b 100644
Binary files a/docs/imgs/dbeaver/viewdata.png and b/docs/imgs/dbeaver/viewdata.png differ
diff --git a/docs/imgs/ha.png b/docs/imgs/ha.png
index 86faa9c..8e8980d 100644
Binary files a/docs/imgs/ha.png and b/docs/imgs/ha.png differ
diff --git a/docs/imgs/idea_debug.png b/docs/imgs/idea_debug.png
index e27e0cd..b548c73 100644
Binary files a/docs/imgs/idea_debug.png and b/docs/imgs/idea_debug.png differ
diff --git a/docs/imgs/impersonation.png b/docs/imgs/impersonation.png
index 2ff5a1f..d6f1cee 100644
Binary files a/docs/imgs/impersonation.png and b/docs/imgs/impersonation.png differ
diff --git a/docs/imgs/kyuubi.png b/docs/imgs/kyuubi.png
index 830ec9b..de17c46 100644
Binary files a/docs/imgs/kyuubi.png and b/docs/imgs/kyuubi.png differ
diff --git a/docs/imgs/kyuubi_architecture.png b/docs/imgs/kyuubi_architecture.png
index 8fcd680..aa7c058 100644
Binary files a/docs/imgs/kyuubi_architecture.png and b/docs/imgs/kyuubi_architecture.png differ
diff --git a/docs/imgs/kyuubi_architecture_new.png b/docs/imgs/kyuubi_architecture_new.png
index f66e660..5c5986f 100644
Binary files a/docs/imgs/kyuubi_architecture_new.png and b/docs/imgs/kyuubi_architecture_new.png differ
diff --git a/docs/imgs/kyuubi_ecosystem.png b/docs/imgs/kyuubi_ecosystem.png
index b811a56..f2337d3 100644
Binary files a/docs/imgs/kyuubi_ecosystem.png and b/docs/imgs/kyuubi_ecosystem.png differ
diff --git a/docs/imgs/kyuubi_internal.png b/docs/imgs/kyuubi_internal.png
index 5a33e26..02e2d52 100644
Binary files a/docs/imgs/kyuubi_internal.png and b/docs/imgs/kyuubi_internal.png differ
diff --git a/docs/imgs/kyuubi_layers.png b/docs/imgs/kyuubi_layers.png
index 0b1d475..5a60bb1 100644
Binary files a/docs/imgs/kyuubi_layers.png and b/docs/imgs/kyuubi_layers.png differ
diff --git a/docs/imgs/kyuubi_migrating_yarn_to_k8s.png b/docs/imgs/kyuubi_migrating_yarn_to_k8s.png
index 8b99965..3640353 100644
Binary files a/docs/imgs/kyuubi_migrating_yarn_to_k8s.png and b/docs/imgs/kyuubi_migrating_yarn_to_k8s.png differ
diff --git a/docs/imgs/kyuubi_positioning.png b/docs/imgs/kyuubi_positioning.png
index 5c6562e..1e8bbdf 100644
Binary files a/docs/imgs/kyuubi_positioning.png and b/docs/imgs/kyuubi_positioning.png differ
diff --git a/docs/imgs/logo/Iceberg-logo.png b/docs/imgs/logo/Iceberg-logo.png
deleted file mode 100644
index 82f18a2..0000000
Binary files a/docs/imgs/logo/Iceberg-logo.png and /dev/null differ
diff --git a/docs/imgs/logo/beaver-head.png b/docs/imgs/logo/beaver-head.png
deleted file mode 100644
index e534372..0000000
Binary files a/docs/imgs/logo/beaver-head.png and /dev/null differ
diff --git a/docs/imgs/logo/hadoop-logo.jpg b/docs/imgs/logo/hadoop-logo.jpg
deleted file mode 100644
index 9fceb32..0000000
Binary files a/docs/imgs/logo/hadoop-logo.jpg and /dev/null differ
diff --git a/docs/imgs/logo/hadoop-yarn-logo.png b/docs/imgs/logo/hadoop-yarn-logo.png
deleted file mode 100644
index 9669434..0000000
Binary files a/docs/imgs/logo/hadoop-yarn-logo.png and /dev/null differ
diff --git a/docs/imgs/logo/hue-logo.svg b/docs/imgs/logo/hue-logo.svg
deleted file mode 100644
index 94165cf..0000000
--- a/docs/imgs/logo/hue-logo.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="100px" height="26px" viewBox="0 0 100 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 54.1 (76490) - https://sketchapp.com -->
-    <title>hue-logo</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="hue-logo" fill-rule="nonzero">
-            <path d="M16.7177136,-6.95379321e-16 C16.5529855,-6.95379321e-16 16.3901364,-6.95379321e-16 16.2266609,0.00751611267 L16.2705049,8.53141422 L6.32606149,8.53141422 C7.02091255,5.72832946 8.44570277,3.15925526 10.4555391,1.08545194 C4.32552284,3.30145249 0,8.67234133 0,14.9489218 C0.0315013936,18.7752685 1.61998667,22.4237641 4.39943128,25.0537089 L10.6252779,25.0537089 C8.528821,22.9492047 7.04292102,20.3151093 6.32606149,17.4323706 L16.2705049,17.4323706 L16.2705049,25.053708 [...]
-            <path d="M23.7759697,1.45060974 L23.7759697,14.1334235 C25.5341138,14.2950199 26.928979,16.7947538 26.928979,19.8550643 C26.928979,22.1581265 26.1385345,24.1430066 24.997338,25.0537089 L28.4359596,25.0537089 C31.0048577,22.3162473 32.4344432,18.7029773 32.4339052,14.9489218 C32.4135291,9.15011137 29.0379755,3.887393 23.7759697,1.45060974 Z M25.5027966,9.0193352 C24.8318942,8.97963321 24.3188245,8.40585682 24.3540841,7.73470628 C24.3195374,7.06403236 24.8324084,6.49103741 25.5 [...]
-            <path d="M46.6625328,25.0537089 C37.7684661,25.0537089 35.1578697,22.3103278 35.1578697,14.699011 L35.1578697,1.07104605 L41.7971025,1.07104605 L41.7971025,14.5223824 C41.7971025,18.5936101 43.1687931,19.4335356 47.1955505,19.4335356 L54.0934629,19.4335356 C58.3857895,19.4335356 59.4912844,18.5936101 59.4912844,14.5223824 L59.4912844,1.07104605 L66.0403241,1.07104605 L66.0403239,14.699011 C66.0409503,22.3103278 63.4297275,25.0537089 54.4473465,25.0537089 L46.6625328,25.053708 [...]
-            <path d="M100,15.4957189 L100,7.61945922 C100,3.81380084 98.0971708,1.07104605 91.238718,1.07104605 L79.6451142,1.07104605 C71.1938719,1.07104605 68.759904,3.41607321 68.759904,10.407937 L68.759904,15.9385433 C68.759904,22.3103278 71.7243841,25.0537089 79.3350746,25.0537089 L96.9916759,25.0537089 L96.9916759,20.0536149 L79.3350746,20.0536149 C76.2378098,20.0536149 75.3527875,19.5224763 75.3527875,16.6018402 L75.3527875,15.4957189 L100,15.4957189 Z M75.3534139,9.96511271 C75.3 [...]
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/docs/imgs/logo/spark-logo-trademark.png b/docs/imgs/logo/spark-logo-trademark.png
deleted file mode 100644
index 16702a9..0000000
Binary files a/docs/imgs/logo/spark-logo-trademark.png and /dev/null differ
diff --git a/docs/imgs/logo/squirrel.jpg b/docs/imgs/logo/squirrel.jpg
deleted file mode 100644
index 31d3fce..0000000
Binary files a/docs/imgs/logo/squirrel.jpg and /dev/null differ
diff --git a/docs/imgs/release/release-process.png b/docs/imgs/release/release-process.png
deleted file mode 100644
index bf7602d..0000000
Binary files a/docs/imgs/release/release-process.png and /dev/null differ
diff --git a/docs/imgs/spark/hang.png b/docs/imgs/spark/hang.png
index 167b71b..1e1d76b 100644
Binary files a/docs/imgs/spark/hang.png and b/docs/imgs/spark/hang.png differ
diff --git a/docs/imgs/spark/sts.png b/docs/imgs/spark/sts.png
index e6d4ed5..035b696 100644
Binary files a/docs/imgs/spark/sts.png and b/docs/imgs/spark/sts.png differ
diff --git a/docs/imgs/spark_jobs_page.png b/docs/imgs/spark_jobs_page.png
index d0e1819..de52466 100644
Binary files a/docs/imgs/spark_jobs_page.png and b/docs/imgs/spark_jobs_page.png differ