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/05/20 08:02:16 UTC
[incubator-linkis] branch dev-1.1.3 updated (b20182d28 -> a2ffc2cee)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch dev-1.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
from b20182d28 Merge pull request #2060 from apache/master
add 00e806815 Support users to deploy linkis without hdfs/hive/spark in localFs(with hdfs) mode (#1804) (#1841)
add 0380a4898 Support BML Service deploy in localFs mode (#1811) (#1843)
add e5e167aea fix install script for result set store path (#1846)
add 1752b13ff Script custom variable run type and suffix constraint configuration. (#1848)
add 583edba22 When downloading data in csv format, the field value is in json format, and the column qualifier can be specified (#1840)
add 3b288f21f fix sql ddl syntax (#1853)
add e844d1fe0 add admin auth check for api /configuration/createSecondCategory and /microservice/allInstance (#1869)
add 06cf78c6d Merge pull request #1876 from apache/master
add 658cb1fb1 add auth check for some udf apis (#1893)
add 654b3a6f2 RPC support modifying parameters such as Ribbon #1887 (#1894)
add 348ee72a5 Add switch to RPC support ribbon parameter #1904 (#1905)
add a10c2628b Linkis management console resource display and reset page, resource display should display instance and Yarn instances. (#1895)
add 577122154 expose ec plugin exception detail (#1903)
add 91a33be11 add junit test for gateway-authentication (#1922)
add 9ffda4d53 add ec/resultSet permission to user not in deployUser group (#1933)
add 3b370cfce Modify the python engine to not load pyspark functions #1906 (#1931)
add ffe2d38fd creator judgment supports multiple judgments #1936 (#1937)
add 3627057e0 Deliever original jobId in linkis-entrance module to EngineConn and LinkisManager (#1941)
add a150af70b Merge remote-tracking branch 'origin/master' into dev-1.1.2
add 4278d6888 use junit5 for some test class
add 73e92ed8e fix conflict of merge
add 2525afc7e Merge pull request #1956 from casionone/dev-1.1.2
add 9f91eee45 add undone job query cache and add api /listundone (#1949)
add 3371401cf remove unused test ut (#1957)
add 0de5b53c9 Add the log of the ContextService module (#1959)
add 8df1bbac1 EC supports add taskIDs into the underlying engine's conf (#1942)
add 7ca980669 System.env should be replaced with System.properties #1965 (#1966)
add a4f541836 refactor some ut logic with junit (#1963)
add 53022e1ee [feature] upgrade log4j-1.2.17 due to security vulnerabilities #1826 (#1968)
add 45d71d60d Computation ec asynchronous execution supports setting the number of concurrent job groups (#1971)
add d22969a1b cat error (#1973)
add 06264e58b [Feature][1.1.2] upgrade protobuf-java due to security vulnerabilities #1827 (#1974)
add 535291cfa update hive version in flink module (#1979)
add 02c1c0f25 Fix reheater concurrency issue #1990 (#1992)
add 2916aeefd Merge remote-tracking branch 'origin/master' into dev-1.1.2-merge-master
add 8b24f4e74 optimize import
add f55907c4a Merge pull request #1994 from WeDataSphere/dev-1.1.2-merge-master
add fa3b9ad38 refactor jobhistoryConfiguration (#1995)
add 10efd04da optimize code
add 8e25ad3ff Add configuration add/get/delete interfaces to configuration #2013
add 5da06151d Code optimization, optimized synchronization lock #2015
add abc2cd9d3 Optimize test code
add 73c429848 Merge pull request #2017 from apache/master
add 64ff48296 exclude extra jar from flink (#2021)
add 048428ba1 Fix ecp material download error，change start byte 0 to 1 in VersionServiceImpl.updateVersion, and fix log info (#2027)
add e00582c71 Configuration rpc interface optimization #2031
add 495a7ecd4 Optimize the Replace into syntax to remove useGeneratedKeys
add 53a66d109 add the repeatability judgment of key-value
add 42b3895ef Fix wrong desc in task with jobRunningTimeoutLabel (#2034)
add 11c8066c6 ECM page 'instance' display mistake. #2036
add c2b7539c1 Refactor the matching relationship between script type and running type in the EntranceInterceptor implementation class. (#2047)
add 57ff5f80c Merge pull request #2051 from apache/master
add 9e177f2a4 Fix: ECM page 'instance' display mistake (#2061)
add 682f0fc18 Add taskID to job idinfo
add c669bcd5a ecm prints entrance taskID log
add 8dc378439 add getJobIdFromStringMap method
add a0e96bed6 prints entrance taskID log
add 8e0c0ac9b am prints entrance taskID log
add deced99af static init method
add 7af91ca6c optimize log
add 2b8503f63 optimize code add locker
add b6fcd5c4e add junit test
add 61b7acc28 add junit test
add e1ec0127d add comment
add 56c5be47c Flexible custom Flink configuration and resources to Flink Engine (#2074)
add 38da9caa0 Add null judgment to the log
add 1d2e81356 add gateway url to request headers
add e03a1933a Add ec type judgment
add be397a29c add gateway url to request headers
add 0f5027387 Format java code with spotless
add fa708c1b1 [fix #1761]command "ip addr" maybe return multiple ips (#1989)
add 3147be72b 1. configuration - add permission check in method "updateCategoryInfo" (#2086)
add 613e142e4 UseFormat is required in functionManagement and udfManagement (#2087)
add 50cd8a952 Optimize the progress get logic of Hive and Spark
add 490333e83 add engine conn status scan time conf
add d3b4b443e optimize code
add b096014d0 use python3 the "/appcom/Install/anaconda3/bin/python" not found (#2090)
add f4614b5ad Fix the deadlock issue of Manager db under high concurrency (#2100)
add 43b548b53 Remove DISCLAIMER-WIP (#2066)
add ca86d9737 fix OpenLooKengEngine
add f320f5dd7 add upgrade for 1.1.1_schema
add 468e63364 for the same field in different tables, the length needs to be kept the same
add b2272fe3b ddl update for 1.1.1
add da42a747f fix OpenLooKeng ddl
add 24a80da4a add ASF header License (#2084)
add ec962901e Merge pull request #2101 from apache/dev-1.1.1
add e0c9310f5 Merge pull request #2102 from apache/master
add b37ec5d8b Bump mysql-connector-java (#1947)
add 7cbf51f8b Bump hive-exec in /linkis-engineconn-plugins/engineconn-plugins/hive (#1948)
add e065339a1 Bump hive-exec (#1950)
add 420cff143 Bump hive-jdbc in /linkis-engineconn-plugins/engineconn-plugins/jdbc (#1951)
add 6134ef23b feat(cglib): optimized the cglib (#2016)
add 33b197937 feat(dependency): unify the json4s dependency, and add spark's version commont (#2018)
add 97930c125 set <hive.version>2.3.3</hive.version>
add c953223af update license
add de573a011 [Bug-2103] Fixed the bug of kinit thread startup when JDBC is not enabled with kerberos. (#2112)
add ef3abb78f Add Sqoop Engine (#2109)
add 87d1cb016 linkis-storage module replace cglib with Use spring inline cglib (#2116)
add ad447abd1 update linkis project version to 1.1.2 (#2120)
add 163d4a442 Modify insert on update to replace into close #2121 (#2122)
add 66178e82c [Bug-2126] Fix the bug of open file runtime configuration value cannot be parsed properly. (#2127)
add 4a3fb0772 [Bug-2110] Remove maven-warpper.jar & upgrade py4j-*-src.zip (#2113) (#2123)
add 9b019f841 Merge pull request #2128 from apache/master
add 7a26e85c5 remove unused python module pandas which cause exception (#2131)
add f7d884b63 create dir for wds.linkis.server.mdm.service.temp.location (#2133)
add 92e7ad0c4 Dev [1.1.2] add junit test to linkis-variable (#2028)
add 51d3114f5 Dev 1.1.2 add junit test to linkis-configuration (#2019)
add 4963d6232 Merge pull request #2129 from apache/dev-1.1.2
new a2ffc2cee Merge pull request #2139 from apache/master
The 1 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:
.mvn/wrapper/maven-wrapper.jar | Bin 50710 -> 0 bytes
DISCLAIMER | 6 +
DISCLAIMER-WIP | 17 -
LICENSE | 15 +-
LICENSE-binary | 3 +
LICENSE-binary-ui | 4 +-
NOTICE-binary | 24 +-
.../conf/linkis-ps-publicservice.properties | 2 +
.../assembly-combined/conf/linkis.properties | 2 +-
.../assembly-combined/pom.xml | 2 +-
.../public-module-combined/pom.xml | 17 +-
.../assembly-combined/sbin/common.sh | 2 +-
assembly-combined-package/bin/checkEnv.sh | 20 +-
assembly-combined-package/bin/common.sh | 2 +-
assembly-combined-package/bin/install.sh | 85 ++--
.../deploy-config/linkis-env.sh | 11 +-
assembly-combined-package/pom.xml | 2 +-
db/linkis_ddl.sql | 2 +-
db/linkis_dml.sql | 25 +-
db/upgrade/1.1.1_schema/mysql/linkis_ddl.sql | 117 +++++
db/upgrade/1.1.1_schema/mysql/linkis_dml.sql | 197 ++++++++
LICENSE => licenses-binary/LICENSE-sqoop.txt | 168 ++++++-
LICENSE => licenses-binary/LICENSE-tephra.txt | 62 ---
.../{LICENSE-commons-io.txt => LICENSE-twill.txt} | 0
.../LICENSE-py4j-0.10.9.5-src.txt | 2 +-
linkis-commons/linkis-common/pom.xml | 4 +-
.../linkis/common/utils/CodeAndRunTypeUtils.scala | 77 +++
.../common/utils/CodeAndRunTypeUtilsTest.scala | 63 +++
.../linkis/common/utils/OverloadUtilsTest.scala | 35 --
linkis-commons/linkis-hadoop-common/pom.xml | 2 +-
linkis-commons/linkis-httpclient/pom.xml | 2 +-
linkis-commons/linkis-module/pom.xml | 7 +-
linkis-commons/linkis-mybatis/pom.xml | 2 +-
linkis-commons/linkis-protocol/pom.xml | 2 +-
linkis-commons/linkis-rpc/pom.xml | 11 +-
.../linkis/rpc/message/method/MessageExecutor.java | 11 +-
.../message/utils/LoadBalancerOptionsUtils.java | 43 ++
.../apache/linkis/rpc/conf/RPCConfiguration.scala | 2 +
.../linkis/rpc/sender/SpringMVCRPCSender.scala | 6 +-
linkis-commons/linkis-scheduler/pom.xml | 2 +-
linkis-commons/linkis-storage/pom.xml | 20 +-
.../storage/factory/impl/BuildHDFSFileSystem.java | 2 +-
.../storage/factory/impl/BuildLocalFileSystem.java | 2 +-
.../apache/linkis/storage/csv/CSVFsWriter.scala | 3 +-
.../linkis/storage/csv/StorageCSVWriter.scala | 16 +-
.../storage/io/IOMethodInterceptorCreator.scala | 3 +-
.../linkis/storage/script/ScriptFsWriter.scala | 6 +-
.../linkis/storage/script/VariableParser.scala | 2 +-
.../script/compaction/PYScriptCompaction.scala | 9 +-
.../script/compaction/QLScriptCompaction.scala | 10 +-
.../script/compaction/ScalaScriptCompaction.scala | 7 +-
.../script/compaction/ShellScriptCompaction.scala | 11 +-
.../storage/script/parser/PYScriptParser.scala | 8 +-
.../storage/script/parser/QLScriptParser.scala | 10 +-
.../storage/script/parser/ScalaScriptParser.scala | 9 +-
...YScriptParser.scala => ShellScriptParser.scala} | 23 +-
linkis-commons/pom.xml | 2 +-
.../linkis-cli/linkis-cli-application/pom.xml | 2 +-
.../linkis-cli/linkis-cli-common/pom.xml | 2 +-
.../linkis-cli/linkis-cli-core/pom.xml | 2 +-
.../handler/CommandExceptionHandlerTest.java | 60 ++-
.../command/fitter/SingleTplFitterTest.java | 3 +-
.../command/parser/SingleCmdParserTest.java | 45 +-
.../interactor/properties/StdPropsLoaderTest.java | 24 +-
.../linkis-client/linkis-cli/pom.xml | 2 +-
.../linkis-computation-client/pom.xml | 2 +-
.../linkis-computation-governance-common/pom.xml | 2 +-
.../governance/common/paser/CodeParser.scala | 20 +-
.../linkis/governance/common/utils/JobUtils.scala | 42 +-
.../governance/common/utils/JobUtilsTest.scala | 45 ++
.../linkis-engineconn-linux-launch/pom.xml | 2 +-
.../linkis-engineconn-manager-core/pom.xml | 2 +-
.../core/launch/ProcessEngineCommandBuilder.scala | 2 +-
.../linkis-engineconn-manager-server/pom.xml | 2 +-
.../impl/AbstractEngineConnLaunchService.scala | 11 +-
.../linkis-engineconn-manager/pom.xml | 2 +-
.../linkis-once-engineconn/pom.xml | 2 +-
.../linkis-streaming-engineconn/pom.xml | 2 +-
.../linkis-computation-engineconn/pom.xml | 2 +-
.../executor/async/AsyncExecuteContext.scala | 6 +
.../executor/conf/ComputationExecutorConf.scala | 4 +
.../executor/execute/ComputationExecutor.scala | 4 +-
.../hook/executor/FunctionExecutorHook.scala | 13 +-
.../service/TaskExecutionServiceImpl.scala | 14 +-
.../computation/executor/utlis/ProgressUtils.scala | 36 +-
.../linkis-engineconn-common/pom.xml | 2 +-
.../linkis-engineconn-core/pom.xml | 2 +-
.../accessible-executor/pom.xml | 2 +-
.../conf/AccessibleExecutorConfiguration.scala | 1 +
.../execution/AccessibleEngineConnExecution.scala | 6 +-
.../callback-service/pom.xml | 2 +-
.../executor-core/pom.xml | 2 +-
.../resource-executor/pom.xml | 2 +-
.../linkis-engineconn/pom.xml | 2 +-
.../linkis-entrance/pom.xml | 2 +-
.../linkis/entrance/job/EntranceExecutionJob.java | 11 +
.../apache/linkis/entrance/EntranceServer.scala | 2 +-
.../linkis/entrance/execute/EntranceJob.scala | 15 +-
.../entrance/interceptor/RuntypeInterceptor.scala | 13 +-
.../interceptor/impl/CommentInterceptor.scala | 12 +-
.../interceptor/impl/CustomVariableUtils.scala | 30 +-
.../impl/PythonCodeCheckInterceptor.scala | 7 +-
.../interceptor/impl/SQLCodeCheckInterceptor.scala | 6 +-
.../impl/SQLLimitEntranceInterceptor.scala | 6 +-
.../interceptor/impl/ScalaCodeInterceptor.scala | 9 +-
.../impl/SparkCodeCheckInterceptor.scala | 6 +-
.../entrance/timeout/JobTimeoutManager.scala | 1 -
.../linkis-jdbc-driver/pom.xml | 2 +-
.../linkis-manager/label-common/pom.xml | 2 +-
.../label/utils/EngineTypeLabelCreator.java | 4 +
.../linkis-manager/label-manager/pom.xml | 2 +-
.../linkis-application-manager/pom.xml | 2 +-
.../pointer/DefaultEngineConnPluginPointer.scala | 2 +
.../engine/DefaultEngineAskEngineService.scala | 18 +-
.../engine/DefaultEngineCreateService.scala | 15 +-
.../linkis-manager-common/pom.xml | 2 +-
.../entity/persistence/PersistenceLabel.java | 2 +
.../linkis-manager-service-common/pom.xml | 2 +-
.../linkis-manager-persistence/pom.xml | 2 +-
.../linkis/manager/dao/LabelManagerMapper.java | 5 +
.../linkis/manager/dao/impl/LabelManagerMapper.xml | 4 +
.../impl/DefaultLabelManagerPersistence.java | 24 +-
.../linkis-manager/linkis-resource-manager/pom.xml | 2 +-
.../linkis-manager/pom.xml | 2 +-
linkis-computation-governance/pom.xml | 2 +-
.../engineconn-plugins/flink/pom.xml | 42 +-
.../flink/src/main/assembly/distribution.xml | 147 ++++++
.../deployment/ClusterDescriptorAdapter.java | 21 +-
.../YarnApplicationClusterDescriptorAdapter.java | 2 +-
.../flink/client/result/ChangelogResult.java | 2 +-
.../flink/config/FlinkEnvConfiguration.scala | 11 +
.../flink/config/FlinkResourceConfiguration.scala | 6 +-
.../flink/context/EnvironmentContext.scala | 2 +-
.../flink/executor/FlinkCodeOnceExecutor.scala | 2 +-
.../flink/executor/FlinkJarOnceExecutor.scala | 2 +-
.../flink/executor/FlinkOnceExecutor.scala | 17 +-
.../flink/factory/FlinkEngineConnFactory.scala | 94 ++--
.../launch/FlinkEngineConnLaunchBuilder.scala | 2 +-
.../flink/operator/TriggerSavepointOperator.scala | 43 ++
.../resource/FlinkEngineConnResourceFactory.scala | 6 +-
.../engineconn-plugins/hive/pom.xml | 6 +-
.../hive/executor/HiveEngineConnExecutor.scala | 17 +-
.../engineconn-plugins/io_file/pom.xml | 2 +-
.../engineconn-plugins/jdbc/pom.xml | 4 +-
.../engineplugin/jdbc/conf/JDBCConfiguration.scala | 2 +
.../jdbc/executer/JDBCEngineConnExecutor.scala | 8 +-
.../engineconn-plugins/openlookeng/pom.xml | 4 +-
.../openlookeng/src/main/assembly/distribution.xml | 2 +-
.../executor/OpenLooKengEngineConnExecutor.java | 3 +-
.../{log4j2-engineconn.xml => log4j2.xml} | 0
.../engineconn-plugins/pipeline/pom.xml | 2 +-
.../conf/PipelineEngineConfiguration.scala | 4 +-
.../pipeline/constant/PipeLineConstant.scala | 1 +
.../pipeline/executor/CSVExecutor.scala | 5 +-
.../engineconn-plugins/python/pom.xml | 2 +-
.../python/src/main/py4j/py4j-0.10.7-src.zip | Bin 42437 -> 0 bytes
.../python/src/main/py4j/py4j-0.10.9.5-src.zip | Bin 0 -> 42404 bytes
.../python/src/main/resources/python/python.py | 1 -
.../python/conf/PythonEngineConfiguration.scala | 2 +-
.../engineconn-plugins/shell/pom.xml | 2 +-
.../engineconn-plugins/spark/pom.xml | 20 +-
.../spark/config/SparkConfiguration.scala | 2 +-
.../spark/executor/SparkEngineConnExecutor.scala | 36 +-
.../spark/executor/SparkScalaExecutor.scala | 2 +-
.../engineconn-plugins/{hive => sqoop}/pom.xml | 246 +++------
.../sqoop/src/main/assembly/distribution.xml | 324 ++++++++++++
.../sqoop/client/LinkisSqoopClient.java | 229 +++++++++
.../engineconnplugin/sqoop/client/Sqoop.java | 551 +++++++++++++++++++++
.../sqoop/client/config/ExecutionContext.java | 12 +-
.../sqoop/client/config/ParamsMapping.java | 144 ++++++
.../client/exception/JobClosableException.java | 20 +-
.../client/exception/JobExecutionException.java | 19 +-
.../sqoop/client/utils/JarLoader.java | 170 +++++++
.../java/org/apache/sqoop/mapreduce/JobBase.java | 410 +++++++++++++++
.../main/resources/linkis-engineconn.properties | 12 +-
.../src/main/resources/log4j2.xml} | 9 +-
.../sqoop/SqoopEngineConnPlugin.scala | 66 +++
.../sqoop/context/SqoopEngineConnContext.scala | 12 +-
.../sqoop/context/SqoopEnvConfiguration.scala | 39 ++
.../sqoop/context/SqoopParamsConfiguration.scala | 42 ++
.../sqoop/context/SqoopResourceConfiguration.scala | 16 +-
.../sqoop/executor/SqoopExecutor.scala | 50 ++
.../sqoop/executor/SqoopOnceCodeExecutor.scala | 142 ++++++
.../sqoop/executor/SqoopOnceExecutor.scala | 67 +++
.../sqoop/factory/SqoopEngineConnFactory.scala | 45 ++
.../sqoop/factory/SqoopExecutorFactory.scala | 43 ++
.../launch/SqoopEngineConnLaunchBuilder.scala | 92 ++++
.../sqoop/params/SqoopParamsResolver.scala | 21 +-
.../resource/SqoopEngineConnResourceFactory.scala | 18 +-
.../engineconnplugin/sqoop/util/ClassUtil.scala | 40 ++
.../linkis-engineconn-plugin-cache/pom.xml | 2 +-
.../linkis-engineconn-plugin-core/pom.xml | 2 +-
.../linkis-engineconn-plugin-loader/pom.xml | 2 +-
.../linkis-engineconn-plugin-server/pom.xml | 2 +-
linkis-engineconn-plugins/pom.xml | 3 +-
linkis-extensions/linkis-io-file-client/pom.xml | 2 +-
.../io/iteraceptor/IOMethodInterceptor.scala | 22 +-
.../IOMethodInterceptorCreatorImpl.scala | 6 +-
linkis-extensions/pom.xml | 2 +-
.../linkis-code-orchestrator/pom.xml | 2 +-
.../linkis-computation-orchestrator/pom.xml | 2 +-
.../reheater/PruneTaskReheaterTransform.scala | 3 +
.../physical/CodeLogicalUnitExecTask.scala | 3 +-
.../service/ComputationTaskExecutionReceiver.scala | 2 +-
.../linkis-orchestrator-core/pom.xml | 2 +-
.../conf/OrchestratorConfiguration.scala | 6 +-
.../orchestrator/converter/AbstractConverter.scala | 2 +-
.../orchestrator/execution/TaskManager.scala | 2 +
.../execution/impl/DefaultTaskManager.scala | 65 ++-
.../execution/impl/NotifyTaskConsumer.scala | 21 +-
.../orchestrator/listener/task/TaskInfoEvent.scala | 2 +-
.../apache/linkis/orchestrator/plans/ast/Job.scala | 36 +-
.../orchestrator/plans/physical/ExecTask.scala | 4 +-
.../plans/physical/RetryExecTask.scala | 2 +-
.../orchestrator/reheater/AbstractReheater.scala | 29 +-
.../linkis/orchestrator/reheater/Reheater.scala | 2 +-
.../reheater/ReheaterNotifyTaskConsumer.scala | 22 +-
.../plugin/linkis-orchestrator-ecm-plugin/pom.xml | 2 +-
linkis-orchestrator/pom.xml | 2 +-
.../linkis-bml/linkis-bml-client/pom.xml | 2 +-
.../linkis-bml/linkis-bml-common/pom.xml | 2 +-
.../linkis-bml/linkis-bml-engine-hook/pom.xml | 2 +-
.../linkis-bml/linkis-bml-server/pom.xml | 2 +-
.../linkis/bml/service/impl/TaskServiceImpl.java | 2 +-
.../bml/service/impl/VersionServiceImpl.java | 3 +-
linkis-public-enhancements/linkis-bml/pom.xml | 2 +-
.../linkis-context-service/linkis-cs-cache/pom.xml | 2 +-
.../cs/contextcache/cache/DefaultContextCache.java | 5 +-
.../cache/csid/impl/ContextIDValueImpl.java | 5 +-
.../linkis-cs-client/pom.xml | 2 +-
.../cs/client/service/CSMetaDataService.java | 1 +
.../cs/client/service/CSNodeServiceImpl.java | 1 +
.../cs/client/service/CSResourceService.java | 2 +
.../cs/client/service/CSResultDataServiceImpl.java | 6 +
.../linkis/cs/client/service/CSTableService.java | 27 +
.../cs/client/service/CSVariableService.java | 12 +
.../cs/client/service/CSWorkServiceImpl.java | 1 +
.../client/service/LinkisJobDataServiceImpl.java | 16 +-
.../linkis-cs-common/pom.xml | 2 +-
.../linkis-cs-highavailable/pom.xml | 2 +-
.../cs/highavailable/DefaultContextHAManager.java | 6 +-
.../highavailable/proxy/MethodInterceptorImpl.java | 7 +-
.../linkis-cs-listener/pom.xml | 2 +-
.../linkis-cs-persistence/pom.xml | 2 +-
.../linkis-cs-search/pom.xml | 2 +-
.../execution/ruler/NearestContextSearchRuler.java | 5 +-
.../linkis-cs-server/pom.xml | 2 +-
.../cs/server/service/impl/ContextServiceImpl.java | 4 +
.../linkis-context-service/pom.xml | 2 +-
.../linkis-datasource-client/pom.xml | 2 +-
.../linkis-datasource-manager/common/pom.xml | 2 +-
.../linkis-datasource-manager/server/pom.xml | 2 +-
.../linkis-metadata-manager/common/pom.xml | 2 +-
.../linkis-metadata-manager/server/pom.xml | 2 +-
.../service/elasticsearch/pom.xml | 2 +-
.../linkis-metadata-manager/service/hive/pom.xml | 7 +-
.../metadatamanager/service/HiveMetaService.java | 3 +
.../linkis-metadata-manager/service/kafka/pom.xml | 2 +-
.../metadatamanager/service/KafkaMetaService.java | 3 +
.../linkis-metadata-manager/service/mysql/pom.xml | 4 +-
.../linkis-datasource/linkis-metadata/pom.xml | 2 +-
.../linkis-datasource/pom.xml | 2 +-
.../linkis-configuration/pom.xml | 2 +-
.../linkis/configuration/dao/ConfigMapper.java | 6 +-
.../linkis/configuration/dao/impl/ConfigMapper.xml | 36 +-
.../exception/ConfigurationException.java | 14 +-
.../restful/api/ConfigurationRestfulApi.java | 90 ++++
.../configuration/service/ConfigKeyService.java | 21 +-
.../service/impl/ConfigKeyServiceImpl.java | 177 +++++++
.../service/ConfigurationService.scala | 127 +++--
.../configuration/util/LabelParameterParser.scala | 17 +-
.../java/org/apache/linkis/configuration/Scan.java | 13 +-
.../linkis/configuration/WebApplicationServer.java | 21 +-
.../linkis/configuration/dao/BaseDaoTest.java | 18 +-
.../linkis/configuration/dao/ConfigMapperTest.java | 193 ++++++++
.../linkis/configuration/dao/LabelMapperTest.java | 88 ++++
.../exception/ConfigurationExceptionTest.java | 7 +-
.../restful/api/ConfigurationRestfulApiTest.java | 182 +++++++
.../linkis/configuration/restful/api/MvcUtils.java | 119 +++++
.../util/ConfigurationConfigurationTest.java | 25 +-
.../configuration/util/LabelEntityParserTest.java | 57 +++
.../src/test/resources/application.properties | 56 +++
.../src/test/resources/create.sql | 89 ++++
.../src/test/resources/data.sql | 51 ++
.../src/test/resources/linkis.properties | 0
.../linkis-error-code-client/pom.xml | 2 +-
.../linkis-error-code-common/pom.xml | 2 +-
.../linkis-error-code-server/pom.xml | 2 +-
.../linkis-publicservice/linkis-error-code/pom.xml | 2 +-
.../linkis-instance-label-client/pom.xml | 2 +-
.../linkis-instance-label-server/pom.xml | 2 +-
.../instance/label/restful/InstanceRestful.java | 22 +-
.../linkis-publicservice/linkis-jobhistory/pom.xml | 2 +-
.../linkis/jobhistory/cache/QueryCacheManager.java | 2 +
.../cache/impl/DefaultQueryCacheManager.java | 77 +++
.../cache/impl/ScheduledRefreshUndoneJob.java | 45 ++
.../linkis/jobhistory/dao/JobHistoryMapper.java | 15 +-
.../jobhistory/dao/impl/JobHistoryMapper.xml | 15 +
.../jobhistory/restful/api/QueryRestfulApi.java | 77 ++-
.../jobhistory/conf/JobhistoryConfiguration.scala | 4 +
.../jobhistory/service/JobHistoryQueryService.java | 2 +-
.../service/impl/JobHistoryQueryServiceImpl.scala | 10 +-
.../linkis-ps-common-lock/pom.xml | 2 +-
.../linkis-storage-script-dev-client/pom.xml | 2 +-
.../linkis-storage-script-dev-server/pom.xml | 2 +-
.../filesystem/restful/api/FsRestfulApi.java | 6 +-
.../linkis-udf/linkis-udf-client/pom.xml | 2 +-
.../scala/org/apache/linkis/udf/UDFClient.scala | 12 +-
.../linkis-udf/linkis-udf-common/pom.xml | 2 +-
.../org/apache/linkis/udf/entity/UDFVersion.java | 17 +
.../linkis-udf/linkis-udf-service/pom.xml | 2 +-
.../java/org/apache/linkis/udf/dao/UDFTreeDao.java | 2 +
.../org/apache/linkis/udf/dao/impl/UDFTreeDao.xml | 9 +-
.../udf/service/impl/UDFTreeServiceImpl.java | 27 +-
.../java/org/apache/linkis/udf/TestUDFTree.java | 43 --
.../linkis-publicservice/linkis-variable/pom.xml | 2 +-
.../test/java/org/apache/linkis/variable/Scan.java | 13 +-
.../linkis/variable/WebApplicationServer.java | 21 +-
.../apache/linkis/variable/dao/BaseDaoTest.java | 18 +-
.../apache/linkis/variable/dao/VarMapperTest.java | 107 ++++
.../restful/api/VariableRestfulApiTest.java | 39 +-
.../variable/service/VariableServiceTest.java | 69 +++
.../src/test/resources/application.properties | 56 +++
.../linkis-variable/src/test/resources/create.sql | 45 ++
.../linkis-variable/src/test/resources/data.sql | 32 ++
.../linkis-publicservice/pom.xml | 2 +-
linkis-public-enhancements/pom.xml | 2 +-
.../linkis-service-discovery/linkis-eureka/pom.xml | 2 +-
.../linkis-gateway-authentication/pom.xml | 2 +-
.../gateway/authentication/dao/TokenDao.java | 4 +-
.../authentication/dao/impl/TokenMapper.xml | 8 +-
.../service/CachedTokenService.scala | 9 +-
.../apache/linkis/gateway/authentication/Scan.java | 13 +-
.../authentication/WebApplicationServer.java | 21 +-
.../gateway/authentication/dao/BaseDaoTest.java} | 25 +-
.../gateway/authentication/dao/TokenDaoTest.java} | 28 +-
.../service/CachedTokenServiceTest.java | 82 +++
.../src/test/resources/application.properties | 62 +++
.../src/test/resources/create.sql | 19 +-
.../src/test/resources/data.sql | 28 ++
.../src/test/resources/linkis.properties | 0
.../linkis-gateway-core/pom.xml | 2 +-
.../gateway/config/GatewayConfiguration.scala | 3 +
.../linkis/gateway/security/SecurityFilter.scala | 18 +-
.../linkis-gateway-httpclient-support/pom.xml | 2 +-
.../linkis-gateway-server-support/pom.xml | 2 +-
.../linkis-spring-cloud-gateway/pom.xml | 2 +-
.../SpringCloudGatewayConfiguration.scala | 17 +-
.../http/LinkisGatewayHttpHeadersFilter.scala | 56 +++
.../linkis-gateway-datasource-ruler/pom.xml | 2 +-
.../linkis-service-gateway/pom.xml | 2 +-
linkis-spring-cloud-services/pom.xml | 2 +-
pom.xml | 59 ++-
tool/dependencies/known-dependencies.txt | 92 +++-
web/.env | 2 +-
web/config.sh | 12 +-
web/install.sh | 79 ++-
.../module/functionManagement/addFunctionModal.vue | 18 +-
.../apps/URM/module/functionManagement/index.vue | 6 +
.../URM/module/udfManagement/addFunctionModal.vue | 7 +
web/src/apps/URM/module/udfManagement/index.vue | 6 +
web/src/apps/linkis/module/ECM/engineConn.vue | 2 +-
web/src/apps/linkis/module/ECM/index.vue | 2 +-
.../linkis/module/resourceManagement/index.vue | 51 +-
web/vue.config.js | 2 +-
365 files changed, 7210 insertions(+), 1339 deletions(-)
delete mode 100644 .mvn/wrapper/maven-wrapper.jar
create mode 100644 DISCLAIMER
delete mode 100644 DISCLAIMER-WIP
create mode 100644 db/upgrade/1.1.1_schema/mysql/linkis_ddl.sql
copy LICENSE => licenses-binary/LICENSE-sqoop.txt (75%)
copy LICENSE => licenses-binary/LICENSE-tephra.txt (79%)
copy licenses-binary/{LICENSE-commons-io.txt => LICENSE-twill.txt} (100%)
rename linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/LICENSE-py4j-0.10.7-src.txt => licenses/LICENSE-py4j-0.10.9.5-src.txt (95%)
create mode 100644 linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtils.scala
create mode 100644 linkis-commons/linkis-common/src/test/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtilsTest.scala
create mode 100644 linkis-commons/linkis-rpc/src/main/java/org/apache/linkis/rpc/message/utils/LoadBalancerOptionsUtils.java
copy linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/script/parser/{PYScriptParser.scala => ShellScriptParser.scala} (69%)
copy linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/script/compaction/QLScriptCompaction.scala => linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/JobUtils.scala (53%)
create mode 100644 linkis-computation-governance/linkis-computation-governance-common/src/test/scala/org/apache/linkis/governance/common/utils/JobUtilsTest.scala
copy linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/script/compaction/PYScriptCompaction.scala => linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/utlis/ProgressUtils.scala (51%)
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/flink/src/main/scala/org/apache/linkis/engineconnplugin/flink/operator/TriggerSavepointOperator.scala
copy linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/resources/{log4j2-engineconn.xml => log4j2.xml} (100%)
delete mode 100644 linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/py4j-0.10.7-src.zip
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/py4j-0.10.9.5-src.zip
copy linkis-engineconn-plugins/engineconn-plugins/{hive => sqoop}/pom.xml (59%)
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/assembly/distribution.xml
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/java/org/apache/linkis/engineconnplugin/sqoop/client/LinkisSqoopClient.java
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/java/org/apache/linkis/engineconnplugin/sqoop/client/Sqoop.java
copy linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/exception/ConfigurationException.java => linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/java/org/apache/linkis/engineconnplugin/sqoop/client/config/ExecutionContext.java (69%)
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/java/org/apache/linkis/engineconnplugin/sqoop/client/config/ParamsMapping.java
copy linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/exception/ConfigurationException.java => linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/java/org/apache/linkis/engineconnplugin/sqoop/client/exception/JobClosableException.java (59%)
copy linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/exception/ConfigurationException.java => linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/java/org/apache/linkis/engineconnplugin/sqoop/client/exception/JobExecutionException.java (61%)
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/java/org/apache/linkis/engineconnplugin/sqoop/client/utils/JarLoader.java
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/java/org/apache/sqoop/mapreduce/JobBase.java
copy web/config.sh => linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/resources/linkis-engineconn.properties (73%)
rename linkis-engineconn-plugins/engineconn-plugins/{openlookeng/src/main/resources/log4j2-engineconn.xml => sqoop/src/main/resources/log4j2.xml} (99%)
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/SqoopEngineConnPlugin.scala
copy linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheManager.java => linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/context/SqoopEngineConnContext.scala (67%)
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/context/SqoopEnvConfiguration.scala
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/context/SqoopParamsConfiguration.scala
copy linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/main/java/org/apache/linkis/gateway/authentication/dao/TokenDao.java => linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/context/SqoopResourceConfiguration.scala (64%)
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/executor/SqoopExecutor.scala
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/executor/SqoopOnceCodeExecutor.scala
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/executor/SqoopOnceExecutor.scala
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/factory/SqoopEngineConnFactory.scala
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/factory/SqoopExecutorFactory.scala
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/launch/SqoopEngineConnLaunchBuilder.scala
copy linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheManager.java => linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/params/SqoopParamsResolver.scala (67%)
copy linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/QueryCacheManager.java => linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/resource/SqoopEngineConnResourceFactory.scala (62%)
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/sqoop/src/main/scala/org/apache/linkis/engineconnplugin/sqoop/util/ClassUtil.scala
copy linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/main/java/org/apache/linkis/gateway/authentication/dao/TokenDao.java => linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/ConfigKeyService.java (53%)
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/ConfigKeyServiceImpl.java
copy db/upgrade/1.1.1_schema/mysql/linkis_dml.sql => linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/Scan.java (75%)
copy db/upgrade/1.1.1_schema/mysql/linkis_dml.sql => linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/WebApplicationServer.java (54%)
copy db/upgrade/1.1.1_schema/mysql/linkis_dml.sql => linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/BaseDaoTest.java (62%)
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/ConfigMapperTest.java
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/LabelMapperTest.java
copy db/upgrade/1.1.1_schema/mysql/linkis_dml.sql => linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/exception/ConfigurationExceptionTest.java (81%)
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApiTest.java
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/restful/api/MvcUtils.java
copy db/upgrade/1.1.1_schema/mysql/linkis_dml.sql => linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/ConfigurationConfigurationTest.java (53%)
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/java/org/apache/linkis/configuration/util/LabelEntityParserTest.java
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/resources/application.properties
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/resources/create.sql
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/test/resources/data.sql
copy linkis-public-enhancements/linkis-publicservice/{linkis-jobhistory => linkis-configuration}/src/test/resources/linkis.properties (100%)
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/cache/impl/ScheduledRefreshUndoneJob.java
delete mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/TestUDFTree.java
copy db/upgrade/1.1.1_schema/mysql/linkis_dml.sql => linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/Scan.java (75%)
copy db/upgrade/1.1.1_schema/mysql/linkis_dml.sql => linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/WebApplicationServer.java (54%)
copy db/upgrade/1.1.1_schema/mysql/linkis_dml.sql => linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/dao/BaseDaoTest.java (62%)
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/dao/VarMapperTest.java
copy linkis-computation-governance/linkis-client/linkis-cli/linkis-cli-core/src/test/java/org/apache/linkis/cli/core/exception/handler/CommandExceptionHandlerTest.java => linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/restful/api/VariableRestfulApiTest.java (51%)
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/java/org/apache/linkis/variable/service/VariableServiceTest.java
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/resources/application.properties
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/resources/create.sql
create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-variable/src/test/resources/data.sql
copy db/upgrade/1.1.1_schema/mysql/linkis_dml.sql => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/gateway/authentication/Scan.java (74%)
copy db/upgrade/1.1.1_schema/mysql/linkis_dml.sql => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/gateway/authentication/WebApplicationServer.java (54%)
copy linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/{main/java/org/apache/linkis/gateway/authentication/dao/TokenDao.java => test/java/org/apache/linkis/gateway/authentication/dao/BaseDaoTest.java} (62%)
copy linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/{main/java/org/apache/linkis/gateway/authentication/dao/TokenDao.java => test/java/org/apache/linkis/gateway/authentication/dao/TokenDaoTest.java} (56%)
create mode 100644 linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/gateway/authentication/service/CachedTokenServiceTest.java
create mode 100644 linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/resources/application.properties
copy db/upgrade/1.1.1_schema/mysql/linkis_dml.sql => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/resources/create.sql (59%)
create mode 100644 linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/resources/data.sql
copy {linkis-public-enhancements/linkis-publicservice/linkis-jobhistory => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication}/src/test/resources/linkis.properties (100%)
create mode 100644 linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/org/apache/linkis/gateway/springcloud/http/LinkisGatewayHttpHeadersFilter.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/01: Merge pull request #2139 from apache/master
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit a2ffc2ceef013cd8a779d1de5c2c6096f53588bb
Merge: b20182d28 4963d6232
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri May 20 16:02:09 2022 +0800
Merge pull request #2139 from apache/master
Merge master into dev-1.1.3
.mvn/wrapper/maven-wrapper.jar | Bin 50710 -> 0 bytes
DISCLAIMER | 6 +
DISCLAIMER-WIP | 17 -
LICENSE | 15 +-
LICENSE-binary | 3 +
LICENSE-binary-ui | 4 +-
NOTICE-binary | 24 +-
.../conf/linkis-ps-publicservice.properties | 2 +
.../assembly-combined/conf/linkis.properties | 2 +-
.../assembly-combined/pom.xml | 2 +-
.../public-module-combined/pom.xml | 17 +-
.../assembly-combined/sbin/common.sh | 2 +-
assembly-combined-package/bin/checkEnv.sh | 20 +-
assembly-combined-package/bin/common.sh | 2 +-
assembly-combined-package/bin/install.sh | 85 ++--
.../deploy-config/linkis-env.sh | 11 +-
assembly-combined-package/pom.xml | 2 +-
db/linkis_ddl.sql | 2 +-
db/linkis_dml.sql | 25 +-
db/upgrade/1.1.1_schema/mysql/linkis_ddl.sql | 117 +++++
db/upgrade/1.1.1_schema/mysql/linkis_dml.sql | 197 ++++++++
LICENSE => licenses-binary/LICENSE-sqoop.txt | 168 ++++++-
LICENSE => licenses-binary/LICENSE-tephra.txt | 62 ---
LICENSE => licenses-binary/LICENSE-twill.txt | 37 +-
.../LICENSE-py4j-0.10.9.5-src.txt | 2 +-
linkis-commons/linkis-common/pom.xml | 4 +-
.../linkis/common/utils/CodeAndRunTypeUtils.scala | 77 +++
.../common/utils/CodeAndRunTypeUtilsTest.scala | 63 +++
.../linkis/common/utils/OverloadUtilsTest.scala | 35 --
linkis-commons/linkis-hadoop-common/pom.xml | 2 +-
linkis-commons/linkis-httpclient/pom.xml | 2 +-
linkis-commons/linkis-module/pom.xml | 7 +-
linkis-commons/linkis-mybatis/pom.xml | 2 +-
linkis-commons/linkis-protocol/pom.xml | 2 +-
linkis-commons/linkis-rpc/pom.xml | 11 +-
.../linkis/rpc/message/method/MessageExecutor.java | 11 +-
.../message/utils/LoadBalancerOptionsUtils.java | 43 ++
.../apache/linkis/rpc/conf/RPCConfiguration.scala | 2 +
.../linkis/rpc/sender/SpringMVCRPCSender.scala | 6 +-
linkis-commons/linkis-scheduler/pom.xml | 2 +-
linkis-commons/linkis-storage/pom.xml | 20 +-
.../storage/factory/impl/BuildHDFSFileSystem.java | 2 +-
.../storage/factory/impl/BuildLocalFileSystem.java | 2 +-
.../apache/linkis/storage/csv/CSVFsWriter.scala | 3 +-
.../linkis/storage/csv/StorageCSVWriter.scala | 16 +-
.../storage/io/IOMethodInterceptorCreator.scala | 3 +-
.../linkis/storage/script/ScriptFsWriter.scala | 6 +-
.../linkis/storage/script/VariableParser.scala | 2 +-
.../script/compaction/PYScriptCompaction.scala | 9 +-
.../script/compaction/QLScriptCompaction.scala | 10 +-
.../script/compaction/ScalaScriptCompaction.scala | 7 +-
.../script/compaction/ShellScriptCompaction.scala | 11 +-
.../storage/script/parser/PYScriptParser.scala | 8 +-
.../storage/script/parser/QLScriptParser.scala | 10 +-
.../storage/script/parser/ScalaScriptParser.scala | 9 +-
...YScriptParser.scala => ShellScriptParser.scala} | 23 +-
linkis-commons/pom.xml | 2 +-
.../linkis-cli/linkis-cli-application/pom.xml | 2 +-
.../linkis-cli/linkis-cli-common/pom.xml | 2 +-
.../linkis-cli/linkis-cli-core/pom.xml | 2 +-
.../handler/CommandExceptionHandlerTest.java | 60 ++-
.../command/fitter/SingleTplFitterTest.java | 3 +-
.../command/parser/SingleCmdParserTest.java | 45 +-
.../interactor/properties/StdPropsLoaderTest.java | 24 +-
.../linkis-client/linkis-cli/pom.xml | 2 +-
.../linkis-computation-client/pom.xml | 2 +-
.../linkis-computation-governance-common/pom.xml | 2 +-
.../governance/common/paser/CodeParser.scala | 20 +-
.../linkis/governance/common/utils/JobUtils.scala | 42 +-
.../governance/common/utils/JobUtilsTest.scala | 45 ++
.../linkis-engineconn-linux-launch/pom.xml | 2 +-
.../linkis-engineconn-manager-core/pom.xml | 2 +-
.../core/launch/ProcessEngineCommandBuilder.scala | 2 +-
.../linkis-engineconn-manager-server/pom.xml | 2 +-
.../impl/AbstractEngineConnLaunchService.scala | 11 +-
.../linkis-engineconn-manager/pom.xml | 2 +-
.../linkis-once-engineconn/pom.xml | 2 +-
.../linkis-streaming-engineconn/pom.xml | 2 +-
.../linkis-computation-engineconn/pom.xml | 2 +-
.../executor/async/AsyncExecuteContext.scala | 6 +
.../executor/conf/ComputationExecutorConf.scala | 4 +
.../executor/execute/ComputationExecutor.scala | 4 +-
.../hook/executor/FunctionExecutorHook.scala | 13 +-
.../service/TaskExecutionServiceImpl.scala | 14 +-
.../computation/executor/utlis/ProgressUtils.scala | 36 +-
.../linkis-engineconn-common/pom.xml | 2 +-
.../linkis-engineconn-core/pom.xml | 2 +-
.../accessible-executor/pom.xml | 2 +-
.../conf/AccessibleExecutorConfiguration.scala | 1 +
.../execution/AccessibleEngineConnExecution.scala | 6 +-
.../callback-service/pom.xml | 2 +-
.../executor-core/pom.xml | 2 +-
.../resource-executor/pom.xml | 2 +-
.../linkis-engineconn/pom.xml | 2 +-
.../linkis-entrance/pom.xml | 2 +-
.../linkis/entrance/job/EntranceExecutionJob.java | 11 +
.../apache/linkis/entrance/EntranceServer.scala | 2 +-
.../linkis/entrance/execute/EntranceJob.scala | 15 +-
.../entrance/interceptor/RuntypeInterceptor.scala | 13 +-
.../interceptor/impl/CommentInterceptor.scala | 12 +-
.../interceptor/impl/CustomVariableUtils.scala | 30 +-
.../impl/PythonCodeCheckInterceptor.scala | 7 +-
.../interceptor/impl/SQLCodeCheckInterceptor.scala | 6 +-
.../impl/SQLLimitEntranceInterceptor.scala | 6 +-
.../interceptor/impl/ScalaCodeInterceptor.scala | 9 +-
.../impl/SparkCodeCheckInterceptor.scala | 6 +-
.../entrance/timeout/JobTimeoutManager.scala | 1 -
.../linkis-jdbc-driver/pom.xml | 2 +-
.../linkis-manager/label-common/pom.xml | 2 +-
.../label/utils/EngineTypeLabelCreator.java | 4 +
.../linkis-manager/label-manager/pom.xml | 2 +-
.../linkis-application-manager/pom.xml | 2 +-
.../pointer/DefaultEngineConnPluginPointer.scala | 2 +
.../engine/DefaultEngineAskEngineService.scala | 18 +-
.../engine/DefaultEngineCreateService.scala | 15 +-
.../linkis-manager-common/pom.xml | 2 +-
.../entity/persistence/PersistenceLabel.java | 2 +
.../linkis-manager-service-common/pom.xml | 2 +-
.../linkis-manager-persistence/pom.xml | 2 +-
.../linkis/manager/dao/LabelManagerMapper.java | 5 +
.../linkis/manager/dao/impl/LabelManagerMapper.xml | 4 +
.../impl/DefaultLabelManagerPersistence.java | 24 +-
.../linkis-manager/linkis-resource-manager/pom.xml | 2 +-
.../linkis-manager/pom.xml | 2 +-
linkis-computation-governance/pom.xml | 2 +-
.../engineconn-plugins/flink/pom.xml | 42 +-
.../flink/src/main/assembly/distribution.xml | 147 ++++++
.../deployment/ClusterDescriptorAdapter.java | 21 +-
.../YarnApplicationClusterDescriptorAdapter.java | 2 +-
.../flink/client/result/ChangelogResult.java | 2 +-
.../flink/config/FlinkEnvConfiguration.scala | 11 +
.../flink/config/FlinkResourceConfiguration.scala | 6 +-
.../flink/context/EnvironmentContext.scala | 2 +-
.../flink/executor/FlinkCodeOnceExecutor.scala | 2 +-
.../flink/executor/FlinkJarOnceExecutor.scala | 2 +-
.../flink/executor/FlinkOnceExecutor.scala | 17 +-
.../flink/factory/FlinkEngineConnFactory.scala | 94 ++--
.../launch/FlinkEngineConnLaunchBuilder.scala | 2 +-
.../flink/operator/TriggerSavepointOperator.scala | 43 ++
.../resource/FlinkEngineConnResourceFactory.scala | 6 +-
.../engineconn-plugins/hive/pom.xml | 6 +-
.../hive/executor/HiveEngineConnExecutor.scala | 17 +-
.../engineconn-plugins/io_file/pom.xml | 2 +-
.../engineconn-plugins/jdbc/pom.xml | 4 +-
.../engineplugin/jdbc/conf/JDBCConfiguration.scala | 2 +
.../jdbc/executer/JDBCEngineConnExecutor.scala | 8 +-
.../engineconn-plugins/openlookeng/pom.xml | 4 +-
.../openlookeng/src/main/assembly/distribution.xml | 2 +-
.../executor/OpenLooKengEngineConnExecutor.java | 3 +-
.../{log4j2-engineconn.xml => log4j2.xml} | 0
.../engineconn-plugins/pipeline/pom.xml | 2 +-
.../conf/PipelineEngineConfiguration.scala | 4 +-
.../pipeline/constant/PipeLineConstant.scala | 1 +
.../pipeline/executor/CSVExecutor.scala | 5 +-
.../engineconn-plugins/python/pom.xml | 2 +-
.../python/src/main/py4j/py4j-0.10.7-src.zip | Bin 42437 -> 0 bytes
.../python/src/main/py4j/py4j-0.10.9.5-src.zip | Bin 0 -> 42404 bytes
.../python/src/main/resources/python/python.py | 1 -
.../python/conf/PythonEngineConfiguration.scala | 2 +-
.../engineconn-plugins/shell/pom.xml | 2 +-
.../engineconn-plugins/spark/pom.xml | 20 +-
.../spark/config/SparkConfiguration.scala | 2 +-
.../spark/executor/SparkEngineConnExecutor.scala | 36 +-
.../spark/executor/SparkScalaExecutor.scala | 2 +-
.../engineconn-plugins/{hive => sqoop}/pom.xml | 246 +++------
.../sqoop/src/main/assembly/distribution.xml | 324 ++++++++++++
.../sqoop/client/LinkisSqoopClient.java | 229 +++++++++
.../engineconnplugin/sqoop/client/Sqoop.java | 551 +++++++++++++++++++++
.../sqoop/client/config/ExecutionContext.java | 12 +-
.../sqoop/client/config/ParamsMapping.java | 144 ++++++
.../client/exception/JobClosableException.java | 20 +-
.../client/exception/JobExecutionException.java | 19 +-
.../sqoop/client/utils/JarLoader.java | 170 +++++++
.../java/org/apache/sqoop/mapreduce/JobBase.java | 410 +++++++++++++++
.../main/resources/linkis-engineconn.properties | 12 +-
.../src/main/resources/log4j2.xml} | 9 +-
.../sqoop/SqoopEngineConnPlugin.scala | 66 +++
.../sqoop/context/SqoopEngineConnContext.scala | 12 +-
.../sqoop/context/SqoopEnvConfiguration.scala | 39 ++
.../sqoop/context/SqoopParamsConfiguration.scala | 42 ++
.../sqoop/context/SqoopResourceConfiguration.scala | 16 +-
.../sqoop/executor/SqoopExecutor.scala | 50 ++
.../sqoop/executor/SqoopOnceCodeExecutor.scala | 142 ++++++
.../sqoop/executor/SqoopOnceExecutor.scala | 67 +++
.../sqoop/factory/SqoopEngineConnFactory.scala | 45 ++
.../sqoop/factory/SqoopExecutorFactory.scala | 43 ++
.../launch/SqoopEngineConnLaunchBuilder.scala | 92 ++++
.../sqoop/params/SqoopParamsResolver.scala | 21 +-
.../resource/SqoopEngineConnResourceFactory.scala | 18 +-
.../engineconnplugin/sqoop/util/ClassUtil.scala | 40 ++
.../linkis-engineconn-plugin-cache/pom.xml | 2 +-
.../linkis-engineconn-plugin-core/pom.xml | 2 +-
.../linkis-engineconn-plugin-loader/pom.xml | 2 +-
.../linkis-engineconn-plugin-server/pom.xml | 2 +-
linkis-engineconn-plugins/pom.xml | 3 +-
linkis-extensions/linkis-io-file-client/pom.xml | 2 +-
.../io/iteraceptor/IOMethodInterceptor.scala | 22 +-
.../IOMethodInterceptorCreatorImpl.scala | 6 +-
linkis-extensions/pom.xml | 2 +-
.../linkis-code-orchestrator/pom.xml | 2 +-
.../linkis-computation-orchestrator/pom.xml | 2 +-
.../reheater/PruneTaskReheaterTransform.scala | 3 +
.../physical/CodeLogicalUnitExecTask.scala | 3 +-
.../service/ComputationTaskExecutionReceiver.scala | 2 +-
.../linkis-orchestrator-core/pom.xml | 2 +-
.../conf/OrchestratorConfiguration.scala | 6 +-
.../orchestrator/converter/AbstractConverter.scala | 2 +-
.../orchestrator/execution/TaskManager.scala | 2 +
.../execution/impl/DefaultTaskManager.scala | 65 ++-
.../execution/impl/NotifyTaskConsumer.scala | 21 +-
.../orchestrator/listener/task/TaskInfoEvent.scala | 2 +-
.../apache/linkis/orchestrator/plans/ast/Job.scala | 36 +-
.../orchestrator/plans/physical/ExecTask.scala | 4 +-
.../plans/physical/RetryExecTask.scala | 2 +-
.../orchestrator/reheater/AbstractReheater.scala | 29 +-
.../linkis/orchestrator/reheater/Reheater.scala | 2 +-
.../reheater/ReheaterNotifyTaskConsumer.scala | 22 +-
.../plugin/linkis-orchestrator-ecm-plugin/pom.xml | 2 +-
linkis-orchestrator/pom.xml | 2 +-
.../linkis-bml/linkis-bml-client/pom.xml | 2 +-
.../linkis-bml/linkis-bml-common/pom.xml | 2 +-
.../linkis-bml/linkis-bml-engine-hook/pom.xml | 2 +-
.../linkis-bml/linkis-bml-server/pom.xml | 2 +-
.../linkis/bml/service/impl/TaskServiceImpl.java | 2 +-
.../bml/service/impl/VersionServiceImpl.java | 3 +-
linkis-public-enhancements/linkis-bml/pom.xml | 2 +-
.../linkis-context-service/linkis-cs-cache/pom.xml | 2 +-
.../cs/contextcache/cache/DefaultContextCache.java | 5 +-
.../cache/csid/impl/ContextIDValueImpl.java | 5 +-
.../linkis-cs-client/pom.xml | 2 +-
.../cs/client/service/CSMetaDataService.java | 1 +
.../cs/client/service/CSNodeServiceImpl.java | 1 +
.../cs/client/service/CSResourceService.java | 2 +
.../cs/client/service/CSResultDataServiceImpl.java | 6 +
.../linkis/cs/client/service/CSTableService.java | 27 +
.../cs/client/service/CSVariableService.java | 12 +
.../cs/client/service/CSWorkServiceImpl.java | 1 +
.../client/service/LinkisJobDataServiceImpl.java | 16 +-
.../linkis-cs-common/pom.xml | 2 +-
.../linkis-cs-highavailable/pom.xml | 2 +-
.../cs/highavailable/DefaultContextHAManager.java | 6 +-
.../highavailable/proxy/MethodInterceptorImpl.java | 7 +-
.../linkis-cs-listener/pom.xml | 2 +-
.../linkis-cs-persistence/pom.xml | 2 +-
.../linkis-cs-search/pom.xml | 2 +-
.../execution/ruler/NearestContextSearchRuler.java | 5 +-
.../linkis-cs-server/pom.xml | 2 +-
.../cs/server/service/impl/ContextServiceImpl.java | 4 +
.../linkis-context-service/pom.xml | 2 +-
.../linkis-datasource-client/pom.xml | 2 +-
.../linkis-datasource-manager/common/pom.xml | 2 +-
.../linkis-datasource-manager/server/pom.xml | 2 +-
.../linkis-metadata-manager/common/pom.xml | 2 +-
.../linkis-metadata-manager/server/pom.xml | 2 +-
.../service/elasticsearch/pom.xml | 2 +-
.../linkis-metadata-manager/service/hive/pom.xml | 7 +-
.../metadatamanager/service/HiveMetaService.java | 3 +
.../linkis-metadata-manager/service/kafka/pom.xml | 2 +-
.../metadatamanager/service/KafkaMetaService.java | 3 +
.../linkis-metadata-manager/service/mysql/pom.xml | 4 +-
.../linkis-datasource/linkis-metadata/pom.xml | 2 +-
.../linkis-datasource/pom.xml | 2 +-
.../linkis-configuration/pom.xml | 2 +-
.../linkis/configuration/dao/ConfigMapper.java | 6 +-
.../linkis/configuration/dao/impl/ConfigMapper.xml | 36 +-
.../exception/ConfigurationException.java | 14 +-
.../restful/api/ConfigurationRestfulApi.java | 90 ++++
.../configuration/service/ConfigKeyService.java | 21 +-
.../service/impl/ConfigKeyServiceImpl.java | 177 +++++++
.../service/ConfigurationService.scala | 127 +++--
.../configuration/util/LabelParameterParser.scala | 17 +-
.../java/org/apache/linkis/configuration/Scan.java | 13 +-
.../linkis/configuration/WebApplicationServer.java | 21 +-
.../linkis/configuration/dao/BaseDaoTest.java | 18 +-
.../linkis/configuration/dao/ConfigMapperTest.java | 193 ++++++++
.../linkis/configuration/dao/LabelMapperTest.java | 88 ++++
.../exception/ConfigurationExceptionTest.java | 7 +-
.../restful/api/ConfigurationRestfulApiTest.java | 182 +++++++
.../linkis/configuration/restful/api/MvcUtils.java | 119 +++++
.../util/ConfigurationConfigurationTest.java | 25 +-
.../configuration/util/LabelEntityParserTest.java | 57 +++
.../src/test/resources/application.properties | 56 +++
.../src/test/resources/create.sql | 89 ++++
.../src/test/resources/data.sql | 51 ++
.../src/test/resources/linkis.properties | 15 +-
.../linkis-error-code-client/pom.xml | 2 +-
.../linkis-error-code-common/pom.xml | 2 +-
.../linkis-error-code-server/pom.xml | 2 +-
.../linkis-publicservice/linkis-error-code/pom.xml | 2 +-
.../linkis-instance-label-client/pom.xml | 2 +-
.../linkis-instance-label-server/pom.xml | 2 +-
.../instance/label/restful/InstanceRestful.java | 22 +-
.../linkis-publicservice/linkis-jobhistory/pom.xml | 2 +-
.../linkis/jobhistory/cache/QueryCacheManager.java | 2 +
.../cache/impl/DefaultQueryCacheManager.java | 77 +++
.../cache/impl/ScheduledRefreshUndoneJob.java | 45 ++
.../linkis/jobhistory/dao/JobHistoryMapper.java | 15 +-
.../jobhistory/dao/impl/JobHistoryMapper.xml | 15 +
.../jobhistory/restful/api/QueryRestfulApi.java | 77 ++-
.../jobhistory/conf/JobhistoryConfiguration.scala | 4 +
.../jobhistory/service/JobHistoryQueryService.java | 2 +-
.../service/impl/JobHistoryQueryServiceImpl.scala | 10 +-
.../linkis-ps-common-lock/pom.xml | 2 +-
.../linkis-storage-script-dev-client/pom.xml | 2 +-
.../linkis-storage-script-dev-server/pom.xml | 2 +-
.../filesystem/restful/api/FsRestfulApi.java | 6 +-
.../linkis-udf/linkis-udf-client/pom.xml | 2 +-
.../scala/org/apache/linkis/udf/UDFClient.scala | 12 +-
.../linkis-udf/linkis-udf-common/pom.xml | 2 +-
.../org/apache/linkis/udf/entity/UDFVersion.java | 17 +
.../linkis-udf/linkis-udf-service/pom.xml | 2 +-
.../java/org/apache/linkis/udf/dao/UDFTreeDao.java | 2 +
.../org/apache/linkis/udf/dao/impl/UDFTreeDao.xml | 9 +-
.../udf/service/impl/UDFTreeServiceImpl.java | 27 +-
.../java/org/apache/linkis/udf/TestUDFTree.java | 43 --
.../linkis-publicservice/linkis-variable/pom.xml | 2 +-
.../test/java/org/apache/linkis/variable/Scan.java | 13 +-
.../linkis/variable/WebApplicationServer.java | 21 +-
.../apache/linkis/variable/dao/BaseDaoTest.java | 18 +-
.../apache/linkis/variable/dao/VarMapperTest.java | 107 ++++
.../restful/api/VariableRestfulApiTest.java | 39 +-
.../variable/service/VariableServiceTest.java | 69 +++
.../src/test/resources/application.properties | 56 +++
.../linkis-variable/src/test/resources/create.sql | 45 ++
.../linkis-variable/src/test/resources/data.sql | 32 ++
.../linkis-publicservice/pom.xml | 2 +-
linkis-public-enhancements/pom.xml | 2 +-
.../linkis-service-discovery/linkis-eureka/pom.xml | 2 +-
.../linkis-gateway-authentication/pom.xml | 2 +-
.../gateway/authentication/dao/TokenDao.java | 4 +-
.../authentication/dao/impl/TokenMapper.xml | 8 +-
.../service/CachedTokenService.scala | 9 +-
.../apache/linkis/gateway/authentication/Scan.java | 13 +-
.../authentication/WebApplicationServer.java | 21 +-
.../gateway/authentication/dao/BaseDaoTest.java} | 25 +-
.../gateway/authentication/dao/TokenDaoTest.java} | 28 +-
.../service/CachedTokenServiceTest.java | 82 +++
.../src/test/resources/application.properties | 62 +++
.../src/test/resources/create.sql | 19 +-
.../src/test/resources/data.sql | 28 ++
.../src/test/resources/linkis.properties | 15 +-
.../linkis-gateway-core/pom.xml | 2 +-
.../gateway/config/GatewayConfiguration.scala | 3 +
.../linkis/gateway/security/SecurityFilter.scala | 18 +-
.../linkis-gateway-httpclient-support/pom.xml | 2 +-
.../linkis-gateway-server-support/pom.xml | 2 +-
.../linkis-spring-cloud-gateway/pom.xml | 2 +-
.../SpringCloudGatewayConfiguration.scala | 17 +-
.../http/LinkisGatewayHttpHeadersFilter.scala | 56 +++
.../linkis-gateway-datasource-ruler/pom.xml | 2 +-
.../linkis-service-gateway/pom.xml | 2 +-
linkis-spring-cloud-services/pom.xml | 2 +-
pom.xml | 59 ++-
tool/dependencies/known-dependencies.txt | 92 +++-
web/.env | 2 +-
web/config.sh | 12 +-
web/install.sh | 79 ++-
.../module/functionManagement/addFunctionModal.vue | 18 +-
.../apps/URM/module/functionManagement/index.vue | 6 +
.../URM/module/udfManagement/addFunctionModal.vue | 7 +
web/src/apps/URM/module/udfManagement/index.vue | 6 +
web/src/apps/linkis/module/ECM/engineConn.vue | 2 +-
web/src/apps/linkis/module/ECM/index.vue | 2 +-
.../linkis/module/resourceManagement/index.vue | 51 +-
web/vue.config.js | 2 +-
365 files changed, 7223 insertions(+), 1393 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org