You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/07/26 11:41:00 UTC
[incubator-linkis] 01/01: Merge pull request #2527 from apache/dev-1.2.0
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 70fc6ccffe425de02b2b41a143acbc8d39ddbe17
Merge: eff9d2217 299d987e2
Author: peacewong <wp...@gmail.com>
AuthorDate: Tue Jul 26 19:40:53 2022 +0800
Merge pull request #2527 from apache/dev-1.2.0
Merge 1.2.0 to dev-1.2.1
.github/workflows/build.yml | 2 +-
LICENSE | 32 +++++++-------
linkis-dist/release-docs/LICENSE | 37 +++++++++++-----
linkis-dist/release-docs/NOTICE | 49 ++++++++++++++++-----
.../release-docs/licenses/LICENSE-airlift.txt | 31 ++-----------
.../release-docs/licenses/LICENSE-bval.txt | 10 ++---
.../release-docs/licenses/LICENSE-cglib.txt | 9 ++--
.../release-docs/licenses/LICENSE-expiringmap.txt | 31 ++-----------
.../release-docs/licenses/LICENSE-jdbi.txt | 10 ++---
.../release-docs/licenses/LICENSE-jmxutils.txt | 5 +--
.../release-docs/licenses/LICENSE-presto.txt | 10 ++---
linkis-engineconn-plugins/pom.xml | 1 +
linkis-engineconn-plugins/presto/pom.xml | 34 ++++++++++++++
.../main/resources/linkis-engineconn.properties | 1 +
.../presto/PrestoEngineConnPlugin.scala | 24 +++++-----
.../presto/conf/PrestoConfiguration.scala | 2 +-
.../presto/conf/PrestoEngineConf.scala | 36 +++++++++++++++
.../presto/executer/PrestoEngineConnExecutor.scala | 44 ++++++++++++------
.../presto/factory/PrestoEngineConnFactory.scala | 4 +-
{web => linkis-web}/.editorconfig | 0
{web => linkis-web}/.env | 0
{web => linkis-web}/.eslintignore | 0
{web => linkis-web}/.eslintrc.js | 0
{web => linkis-web}/.gitattributes | 0
{web => linkis-web}/.gitignore | 0
{web => linkis-web}/.jshintrc | 0
{web => linkis-web}/.prettierrc.json | 0
{web => linkis-web}/babel.config.js | 0
{web => linkis-web}/config.sh | 0
{web => linkis-web}/install.sh | 0
{web => linkis-web}/mock.js | 0
{web => linkis-web}/package.json | 0
{web => linkis-web}/postcss.config.js | 0
{web => linkis-web}/public/favicon.ico | Bin
{web => linkis-web}/public/index.html | 0
.../release-docs/LICENSE | 4 +-
NOTICE-binary-ui => linkis-web/release-docs/NOTICE | 0
.../release-docs/licenses}/LICENSE-axios.txt | 0
.../release-docs/licenses}/LICENSE-core-js.txt | 0
.../release-docs/licenses}/LICENSE-dexie.txt | 0
.../licenses}/LICENSE-eslint-plugin-vue.txt | 0
.../release-docs/licenses}/LICENSE-eslint.txt | 0
.../release-docs/licenses}/LICENSE-form-create.txt | 0
.../licenses}/LICENSE-highlight.js.txt | 0
.../release-docs/licenses}/LICENSE-iview.txt | 0
.../release-docs/licenses}/LICENSE-jsencrypt.txt | 0
.../licenses}/LICENSE-license-checker.txt | 0
.../release-docs/licenses}/LICENSE-lodash.txt | 0
.../release-docs/licenses}/LICENSE-md5.txt | 0
.../release-docs/licenses}/LICENSE-mitt.txt | 0
.../release-docs/licenses}/LICENSE-moment.txt | 0
.../licenses}/LICENSE-object-to-formdata.txt | 0
.../release-docs/licenses}/LICENSE-qs.txt | 0
.../licenses}/LICENSE-reconnecting-websocket.txt | 0
.../licenses}/LICENSE-sql-formatter.txt | 0
.../release-docs/licenses}/LICENSE-svgo.txt | 0
.../release-docs/licenses}/LICENSE-vue-i18n.txt | 0
.../release-docs/licenses}/LICENSE-vue-router.txt | 0
.../release-docs/licenses}/LICENSE-vue.txt | 0
.../licenses}/LICENSE-vuedraggable.txt | 0
.../release-docs/licenses}/LICENSE-vuescroll.txt | 0
.../licenses}/LICENSE-worker-loader.txt | 0
.../src/apps/URM/i18n/common/en.json | 0
.../src/apps/URM/i18n/common/zh.json | 0
.../module/functionManagement/addFunctionModal.vue | 0
.../apps/URM/module/functionManagement/index.js | 0
.../apps/URM/module/functionManagement/index.scss | 0
.../apps/URM/module/functionManagement/index.vue | 0
.../URM/module/functionManagement/jarPreview.vue | 0
.../URM/module/functionManagement/pyPreview.vue | 0
.../URM/module/functionManagement/scalaPreview.vue | 0
.../URM/module/functionManagement/usePreview.vue | 0
.../apps/URM/module/functionManagement/vlist.vue | 0
.../src/apps/URM/module/header/index.js | 0
.../src/apps/URM/module/header/index.scss | 0
.../src/apps/URM/module/header/index.vue | 0
.../src/apps/URM/module/header/userMenu.vue | 0
.../URM/module/udfManagement/addFunctionModal.vue | 0
.../src/apps/URM/module/udfManagement/index.js | 0
.../src/apps/URM/module/udfManagement/index.scss | 0
.../src/apps/URM/module/udfManagement/index.vue | 0
.../apps/URM/module/udfManagement/jarPreview.vue | 0
.../apps/URM/module/udfManagement/pyPreview.vue | 0
.../apps/URM/module/udfManagement/scalaPreview.vue | 0
.../apps/URM/module/udfManagement/usePreview.vue | 0
.../src/apps/URM/module/udfManagement/vlist.vue | 0
{web => linkis-web}/src/apps/URM/router.js | 0
{web => linkis-web}/src/apps/URM/view/layout.vue | 0
.../src/apps/URM/view/urm/index.vue | 0
.../src/apps/linkis/assets/styles/console.scss | 0
{web => linkis-web}/src/apps/linkis/bus.js | 0
.../src/apps/linkis/components/cardList/index.js | 0
.../src/apps/linkis/components/cardList/index.scss | 0
.../src/apps/linkis/components/cardList/index.vue | 0
.../src/apps/linkis/components/progress/index.js | 0
.../src/apps/linkis/components/progress/index.scss | 0
.../src/apps/linkis/components/progress/index.vue | 0
.../src/apps/linkis/components/tag/index.js | 0
.../src/apps/linkis/components/tag/index.vue | 0
.../src/apps/linkis/components/variable/index.js | 0
.../src/apps/linkis/components/variable/index.scss | 0
.../src/apps/linkis/components/variable/index.vue | 0
.../src/apps/linkis/i18n/common/en.json | 0
.../src/apps/linkis/i18n/common/zh.json | 0
.../src/apps/linkis/module/ECM/engineConn.vue | 0
.../src/apps/linkis/module/ECM/index.js | 0
.../src/apps/linkis/module/ECM/index.scss | 0
.../src/apps/linkis/module/ECM/index.vue | 0
.../src/apps/linkis/module/ECM/log.vue | 0
.../src/apps/linkis/module/ECM/search.vue | 0
.../src/apps/linkis/module/FAQ/index.js | 0
.../src/apps/linkis/module/FAQ/index.vue | 0
.../apps/linkis/module/datasource/dataSourceApi.js | 0
.../module/datasource/datasourceForm/index.scss | 0
.../module/datasource/datasourceForm/index.vue | 0
.../module/datasource/datasourceType/index.scss | 0
.../module/datasource/datasourceType/index.vue | 0
.../src/apps/linkis/module/datasource/index.js | 0
.../src/apps/linkis/module/datasource/index.scss | 0
.../src/apps/linkis/module/datasource/index.vue | 0
.../linkis/module/globalHistoryManagement/index.js | 0
.../module/globalHistoryManagement/index.scss | 0
.../module/globalHistoryManagement/index.vue | 0
.../module/globalHistoryManagement/viewHistory.vue | 0
.../src/apps/linkis/module/globalValiable/index.js | 0
.../apps/linkis/module/globalValiable/index.scss | 0
.../apps/linkis/module/globalValiable/index.vue | 0
.../src/apps/linkis/module/header/index.js | 0
.../src/apps/linkis/module/header/index.scss | 0
.../src/apps/linkis/module/header/index.vue | 0
.../src/apps/linkis/module/header/userMenu.vue | 0
.../linkis/module/microServiceManagement/index.js | 0
.../module/microServiceManagement/index.scss | 0
.../linkis/module/microServiceManagement/index.vue | 0
.../module/resourceManagement/engineConn.vue | 0
.../apps/linkis/module/resourceManagement/index.js | 0
.../linkis/module/resourceManagement/index.scss | 0
.../linkis/module/resourceManagement/index.vue | 0
.../apps/linkis/module/resourceManagement/log.vue | 0
.../linkis/module/resourceManagement/search.vue | 0
.../src/apps/linkis/module/setting/index.js | 0
.../src/apps/linkis/module/setting/index.scss | 0
.../src/apps/linkis/module/setting/setting.vue | 0
{web => linkis-web}/src/apps/linkis/router.js | 0
.../src/apps/linkis/view/layout.vue | 0
.../src/apps/linkis/view/linkis/index.vue | 0
.../src/apps/scriptis/module/webSocket/index.js | 0
.../src/apps/scriptis/service/db/globalcache.js | 0
.../src/apps/scriptis/service/db/history.js | 0
.../src/apps/scriptis/service/db/log.js | 0
.../src/apps/scriptis/service/db/progress.js | 0
.../src/apps/scriptis/service/db/result.js | 0
.../src/apps/scriptis/service/db/tab.js | 0
.../src/apps/scriptis/service/db/tree.js | 0
{web => linkis-web}/src/common/config/const.js | 0
{web => linkis-web}/src/common/config/db.js | 0
{web => linkis-web}/src/common/config/scriptis.js | 0
.../src/common/helper/clickoutside.js | 0
{web => linkis-web}/src/common/helper/db.js | 0
.../src/common/helper/elementResizeEvent.js | 0
{web => linkis-web}/src/common/helper/emitter.js | 0
{web => linkis-web}/src/common/helper/eventbus.js | 0
{web => linkis-web}/src/common/helper/fesx.js | 0
{web => linkis-web}/src/common/helper/storage.js | 0
{web => linkis-web}/src/common/i18n/en.json | 0
{web => linkis-web}/src/common/i18n/index.js | 0
{web => linkis-web}/src/common/i18n/zh.json | 0
{web => linkis-web}/src/common/service/api.js | 0
{web => linkis-web}/src/common/service/apiCache.js | 0
{web => linkis-web}/src/common/service/db/index.js | 0
{web => linkis-web}/src/common/service/execute.js | 0
.../src/common/service/layoutMixin.js | 0
{web => linkis-web}/src/common/service/mixin.js | 0
.../src/common/service/moduleMixin.js | 0
{web => linkis-web}/src/common/service/socket.js | 0
.../src/common/service/timeToCronMixin.js | 0
.../src/common/style/headerCommon.scss | 0
.../src/common/style/headerUserMenu.scss | 0
.../src/common/style/variables.scss | 0
{web => linkis-web}/src/common/util/convert.js | 0
.../src/common/util/currentModules.js | 0
{web => linkis-web}/src/common/util/debug.js | 0
{web => linkis-web}/src/common/util/index.js | 0
{web => linkis-web}/src/common/util/object.js | 0
{web => linkis-web}/src/common/util/type.js | 0
.../src/components/circleProgress/index.js | 0
.../src/components/circleProgress/index.scss | 0
.../src/components/circleProgress/index.vue | 0
.../src/components/consoleComponent/console.vue | 0
.../components/consoleComponent/dataWrangler.vue | 0
.../src/components/consoleComponent/filter.vue | 0
.../src/components/consoleComponent/filterItem.vue | 0
.../src/components/consoleComponent/index.js | 0
.../src/components/consoleComponent/log.vue | 0
.../src/components/consoleComponent/modal.js | 0
.../src/components/consoleComponent/progress.vue | 0
.../src/components/consoleComponent/result.vue | 0
.../components/consoleComponent/resultSetList.vue | 0
.../components/consoleComponent/resultsExport.vue | 0
.../src/components/consoleComponent/steps.vue | 0
.../src/components/consoleComponent/tableRow.vue | 0
.../src/components/consoleComponent/toolbar.vue | 0
.../consoleComponent/toolbar_progress.vue | 0
.../components/consoleComponent/visualAnalysis.vue | 0
.../src/components/deleteDialog/index.js | 0
.../src/components/deleteDialog/index.scss | 0
.../src/components/deleteDialog/index.vue | 0
.../src/components/directoryDialog/index.js | 0
.../src/components/directoryDialog/index.scss | 0
.../src/components/directoryDialog/index.vue | 0
.../src/components/directoryDialog/show.vue | 0
.../src/components/editor/editor.vue | 0
.../src/components/editor/highRiskGrammar.js | 0
{web => linkis-web}/src/components/editor/index.js | 0
.../src/components/editor/index.scss | 0
.../src/components/editor/keyword/hql.js | 0
.../src/components/editor/keyword/python.js | 0
.../src/components/editor/keyword/sas.js | 0
.../src/components/editor/keyword/sh.js | 0
.../src/components/editor/languages/hql.js | 0
.../src/components/editor/languages/log.js | 0
.../src/components/editor/languages/out.js | 0
.../src/components/editor/languages/sas.js | 0
.../src/components/editor/languages/sh.js | 0
.../src/components/editor/monaco-loader.js | 0
.../editor/sqlFormatter/core/Formatter.js | 0
.../editor/sqlFormatter/core/Indentation.js | 0
.../editor/sqlFormatter/core/InlineBlock.js | 0
.../components/editor/sqlFormatter/core/Params.js | 0
.../editor/sqlFormatter/core/Tokenizer.js | 0
.../editor/sqlFormatter/core/tokenTypes.js | 0
.../editor/sqlFormatter/languages/Db2Formatter.js | 0
.../editor/sqlFormatter/languages/N1qlFormatter.js | 0
.../sqlFormatter/languages/PlSqlFormatter.js | 0
.../sqlFormatter/languages/StandardSqlFormatter.js | 0
.../components/editor/sqlFormatter/sqlFormatter.js | 0
.../src/components/editor/theme/defaultView.js | 0
.../src/components/editor/theme/logView.js | 0
{web => linkis-web}/src/components/editor/util.js | 0
{web => linkis-web}/src/components/index.js | 0
{web => linkis-web}/src/components/log/index.vue | 0
{web => linkis-web}/src/components/menu/index.js | 0
{web => linkis-web}/src/components/menu/index.scss | 0
{web => linkis-web}/src/components/menu/index.vue | 0
.../src/components/menu/menuItem.vue | 0
.../src/components/menu/subMenu.vue | 0
{web => linkis-web}/src/components/navbar/index.js | 0
.../src/components/navbar/index.scss | 0
{web => linkis-web}/src/components/navbar/nav.js | 0
.../src/components/navbar/navbar.vue | 0
.../src/components/navbar/searchbox.vue | 0
{web => linkis-web}/src/components/panel/index.js | 0
.../src/components/panel/index.scss | 0
{web => linkis-web}/src/components/panel/panel.vue | 0
.../src/components/panel/panelItem.vue | 0
.../src/components/svgIcon/index.js | 0
.../src/components/svgIcon/index.vue | 0
.../src/components/svgIcon/svg/common.svg | 0
{web => linkis-web}/src/components/table/index.js | 0
{web => linkis-web}/src/components/table/table.css | 0
{web => linkis-web}/src/components/table/table.vue | 0
{web => linkis-web}/src/components/tag/index.scss | 0
{web => linkis-web}/src/components/tag/index.vue | 0
.../src/components/tree/functionView/index.js | 0
.../src/components/tree/functionView/index.scss | 0
.../src/components/tree/functionView/index.vue | 0
{web => linkis-web}/src/components/tree/index.js | 0
{web => linkis-web}/src/components/tree/index.scss | 0
{web => linkis-web}/src/components/tree/index.vue | 0
{web => linkis-web}/src/components/tree/mixin.js | 0
.../src/components/tree/model/node.js | 0
.../src/components/tree/model/store.js | 0
.../src/components/tree/model/utils.js | 0
{web => linkis-web}/src/components/tree/node.vue | 0
{web => linkis-web}/src/components/tree/support.js | 0
.../src/components/virtualList/index.js | 0
.../virtualTable/fieldTable/fieldsTable.scss | 0
.../virtualTable/fieldTable/fieldsTable.vue | 0
.../components/virtualTable/fieldTable/utils.js | 0
.../components/virtualTable/historyTable/expand.js | 0
.../virtualTable/historyTable/historyTable.vue | 0
.../src/components/virtualTable/index.js | 0
.../src/components/virtualTable/index.scss | 0
.../components/virtualTable/resultTable/body.vue | 0
.../components/virtualTable/resultTable/header.vue | 0
.../components/virtualTable/resultTable/list.vue | 0
.../components/virtualTable/resultTable/table.vue | 0
.../src/components/virtualTree/index.js | 0
.../src/components/virtualTree/item.vue | 0
.../src/components/virtualTree/renderNode.js | 0
.../src/components/virtualTree/tree.vue | 0
.../src/components/watermark/index.css | 0
.../src/components/watermark/index.js | 0
.../src/components/watermark/index.vue | 0
{web => linkis-web}/src/config.json | 0
.../src/dss/assets/images/Linkis.svg | 0
.../src/dss/assets/images/loginbgc.svg | 0
{web => linkis-web}/src/dss/assets/styles/app.scss | 0
.../src/dss/assets/styles/login.scss | 0
.../src/dss/assets/styles/normalize.scss | 0
{web => linkis-web}/src/dss/module/footer/index.js | 0
.../src/dss/module/footer/index.scss | 0
.../src/dss/module/footer/index.vue | 0
{web => linkis-web}/src/dss/module/header/index.js | 0
.../src/dss/module/header/index.scss | 0
.../src/dss/module/header/index.vue | 0
.../src/dss/module/header/navMenu/index.scss | 0
.../src/dss/module/header/navMenu/index.vue | 0
.../src/dss/module/header/userMenu.vue | 0
{web => linkis-web}/src/dss/module/index.js | 0
.../src/dss/module/indexedDB/index.js | 0
.../src/dss/module/resourceSimple/engine.vue | 0
.../src/dss/module/resourceSimple/index.js | 0
.../src/dss/module/resourceSimple/index.scss | 0
.../src/dss/module/resourceSimple/index.vue | 0
.../src/dss/module/resourceSimple/job.vue | 0
.../src/dss/module/resourceSimple/point.vue | 0
.../src/dss/module/resourceSimple/queue.vue | 0
{web => linkis-web}/src/dss/router.js | 0
{web => linkis-web}/src/dss/view/403.vue | 0
{web => linkis-web}/src/dss/view/404.vue | 0
{web => linkis-web}/src/dss/view/500.vue | 0
{web => linkis-web}/src/dss/view/app.vue | 0
.../src/dss/view/commonIframe/index.vue | 0
{web => linkis-web}/src/dss/view/icon.vue | 0
{web => linkis-web}/src/dss/view/layout.vue | 0
{web => linkis-web}/src/dss/view/logPage/index.vue | 0
{web => linkis-web}/src/dss/view/login/index.vue | 0
{web => linkis-web}/src/dynamic-apps.js | 0
{web => linkis-web}/src/main.js | 0
{web => linkis-web}/src/router.js | 0
{web => linkis-web}/src/utils/watermark.js | 0
{web => linkis-web}/vue.config.js | 8 ++--
pom.xml | 16 +++----
tool/dependencies/known-dependencies.txt | 15 ++++++-
335 files changed, 254 insertions(+), 161 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org