Skip to content

Commit

Permalink
changed
Browse files Browse the repository at this point in the history
  • Loading branch information
1625567290 committed Oct 7, 2023
2 parents 1eaf00a + 16183c9 commit a4feb39
Show file tree
Hide file tree
Showing 1,713 changed files with 110,043 additions and 2,923 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
TAG: ${{ github.sha }}
SKIP_TEST: true
HUB: ghcr.io/apache/linkis
LINKIS_VERSION: 1.4.0-SNAPSHOT
LINKIS_VERSION: 1.5.0-SNAPSHOT
steps:
- name: Free up disk space
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
TAG: ${{ github.sha }}
SKIP_TEST: true
HUB: ghcr.io/apache/linkis
LINKIS_VERSION: 1.4.0-SNAPSHOT
LINKIS_VERSION: 1.5.0-SNAPSHOT
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
4 changes: 4 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ The following file are provided under the Apache 2.0 License.
linkis-web/public/favicon.ico
linkis-engineconn-plugins/seatunnel/src/main/java/org/apache/seatunnel/*
linkis-commons/linkis-storage/src/test/resources/scritpis-test.sql
linkis-engineconn-plugins/hbase/hbase-shims-1.2.0/src/main/resources/hbase-ruby/*
linkis-engineconn-plugins/hbase/hbase-shims-1.4.3/src/main/resources/hbase-ruby/*
linkis-engineconn-plugins/hbase/hbase-shims-2.2.6/src/main/resources/hbase-ruby/*
linkis-engineconn-plugins/hbase/hbase-shims-2.5.3/src/main/resources/hbase-ruby/*

The files:
.mvn/wrapper/MavenWrapperDownloader.java
Expand Down
8 changes: 4 additions & 4 deletions docs/configuration/linkis-instance-label-client.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## linkis-instance-label-client 配置
## linkis-pes-rpc-client 配置

| 模块名(服务名) | 参数名 | 默认值 | 描述 |
| -------- | -------- | ----- |----- |
| linkis-instance-label-client |wds.linkis.instance.label.server.name|linkis-ps-publicservice|instance.label.server.name|
| 模块名(服务名) | 参数名 | 默认值 | 描述 |
|-----------------------| -------- | ----- |----- |
| linkis-pes-rpc-client |wds.linkis.instance.label.server.name|linkis-ps-publicservice|instance.label.server.name|
6 changes: 6 additions & 0 deletions docs/configuration/spark.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

| Module Name (Service Name) | Parameter Name | Default Value | Description |Used|
| -------- | -------- | ----- |----- | ----- |
|spark|linkis.spark.yarn.cluster.jars|hdfs:///spark/cluster|spark.yarn.cluster.jars|
|spark|linkis.spark.etl.support.hudi|false|spark.etl.support.hudi|
|spark|linkis.bgservice.store.prefix|hdfs:///tmp/bdp-ide/|bgservice.store.prefix|
|spark|linkis.bgservice.store.suffix| |bgservice.store.suffix|
Expand All @@ -27,6 +28,11 @@
|spark|wds.linkis.spark.engineconn.fatal.log|error writing class;OutOfMemoryError|spark.engineconn.fatal.log|
|spark|wds.linkis.spark.engine.scala.replace_package_header.enable| true |spark.engine.scala.replace_package_header.enable|

Use spark yarn cluster mode,need to set label "engingeConnRuntimeMode": "yarnCluster",and need to upload the dependence of the spark to 'linkis.spark.yarn.cluster.jar'(the default value is 'hdfs:///spark/cluster')
spark dependencies include jars and configuration files,For example: '/appcom/Install/linkis/lib/linkis-engineconn-plugins/spark/dist/3.2.1/lib/*.jar','/appcom/Install/linkis/conf/*'

Precautions for using yarnCluster:
Eureka url if 127.0.0.1 should be changed to the real host, such as "127.0.0.1:20303/eureka/" should be changed to "wds001:20303/eureka/"

The spark-excel package may cause class conflicts,need to download separately,put it in spark lib
wget https://repo1.maven.org/maven2/com/crealytics/spark-excel-2.12.17-3.2.2_2.12/3.2.2_0.18.1/spark-excel-2.12.17-3.2.2_2.12-3.2.2_0.18.1.jar
Expand Down
12 changes: 6 additions & 6 deletions docs/errorcode/linkis-bml-client.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
## linkis-bml-client errorcode
## linkis-pes-client errorcode


| 模块名(服务名) | 错误码 | 描述 | enumeration name(枚举)| Exception Class(类名)|
| -------- |-------| ----- |---------|---------|
|linkis-bml-client| 20060 |the result returned by the repository client POST request does not match(物料库客户端POST请求返回的result不匹配)|POST_REQUEST_RESULT_NOT_MATCH|BmlClientErrorCodeSummary|
|linkis-bml-client| 20061 |failed to copy inputStream and outputStream (inputStream和outputStream流copy失败)|BML_CLIENT_FAILED|BmlClientErrorCodeSummary|
|linkis-bml-client| 20062 |serverUrl cannot be null(serverUrl 不能为空)|SERVER_URL_NOT_NULL|BmlClientErrorCodeSummary|
| 模块名(服务名) | 错误码 | 描述 | enumeration name(枚举)| Exception Class(类名)|
|-------------------|-------| ----- |---------|---------|
| linkis-pes-client | 20060 |the result returned by the repository client POST request does not match(物料库客户端POST请求返回的result不匹配)|POST_REQUEST_RESULT_NOT_MATCH|BmlClientErrorCodeSummary|
| linkis-pes-client | 20061 |failed to copy inputStream and outputStream (inputStream和outputStream流copy失败)|BML_CLIENT_FAILED|BmlClientErrorCodeSummary|
| linkis-pes-client | 20062 |serverUrl cannot be null(serverUrl 不能为空)|SERVER_URL_NOT_NULL|BmlClientErrorCodeSummary|

26 changes: 13 additions & 13 deletions docs/errorcode/linkis-cs-client-errorcode.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
## linkis-cs-client errorcode
## linkis-pes-client errorcode

| module name(模块名) | error code(错误码) | describe(描述) |enumeration name(枚举)| Exception Class(类名)|
| -------- | -------- | ----- |-----|-----|
|linkis-cs-client |80015|create context failed(创建上下文失败)|CREATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
|linkis-cs-client |80015|get context value failed(获取上下文值失败)|GET_CONTEXT_VALUE_FAILED|CsClientErrorCodeSummary|
|linkis-cs-client |80015|update context failed(更新上下文失败)|UPDATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
|linkis-cs-client |80015|reset context failed(重置上下文失败)|RESET_CONTEXT_FAILED|CsClientErrorCodeSummary|
|linkis-cs-client |80015|remove context failed(刪除上下文失败)|REMOVE_CONTEXT_FAILED|CsClientErrorCodeSummary|
|linkis-cs-client |80015|bind context id failed(绑定上下文 ID 失败)|BIND_CONTEXTID_FAILED|CsClientErrorCodeSummary|
|linkis-cs-client |80015|search condition failed(搜索失败)|SEARCH_CONDITION_FAILED|CsClientErrorCodeSummary|
|linkis-cs-client |80015|execute failed(执行失败)|EXECUTE_FALIED|CsClientErrorCodeSummary|
|linkis-cs-client |80017|searchHAIDByTime failed(搜索HAIDByTime失败)|HAIDBYTIME_FAILED|CsClientErrorCodeSummary|
|linkis-cs-client |80017|batch Clear Context By HAID failed(通过 HAID 批量清除上下文失败)|CLEAR_CONTEXT_HAID_FAILED|CsClientErrorCodeSummary|
| module name(模块名) | error code(错误码) | describe(描述) |enumeration name(枚举)| Exception Class(类名)|
|-------------------| -------- | ----- |-----|-----|
| linkis-pes-client |80015|create context failed(创建上下文失败)|CREATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
| linkis-pes-client |80015|get context value failed(获取上下文值失败)|GET_CONTEXT_VALUE_FAILED|CsClientErrorCodeSummary|
| linkis-pes-client |80015|update context failed(更新上下文失败)|UPDATE_CONTEXT_FAILED|CsClientErrorCodeSummary|
| linkis-pes-client |80015|reset context failed(重置上下文失败)|RESET_CONTEXT_FAILED|CsClientErrorCodeSummary|
| linkis-pes-client |80015|remove context failed(刪除上下文失败)|REMOVE_CONTEXT_FAILED|CsClientErrorCodeSummary|
| linkis-pes-client |80015|bind context id failed(绑定上下文 ID 失败)|BIND_CONTEXTID_FAILED|CsClientErrorCodeSummary|
| linkis-pes-client |80015|search condition failed(搜索失败)|SEARCH_CONDITION_FAILED|CsClientErrorCodeSummary|
| linkis-pes-client |80015|execute failed(执行失败)|EXECUTE_FALIED|CsClientErrorCodeSummary|
| linkis-pes-client |80017|searchHAIDByTime failed(搜索HAIDByTime失败)|HAIDBYTIME_FAILED|CsClientErrorCodeSummary|
| linkis-pes-client |80017|batch Clear Context By HAID failed(通过 HAID 批量清除上下文失败)|CLEAR_CONTEXT_HAID_FAILED|CsClientErrorCodeSummary|


22 changes: 11 additions & 11 deletions docs/errorcode/linkis-datasource-client-errorcode.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
## linkis-datasource-client errorcode
## linkis-pes-client errorcode

| module name(模块名) | error code(错误码) | describe(描述) |enumeration name(枚举)| Exception Class(类名)|
| -------- | -------- | ----- |-----|-----|
|linkis-datasource-client |31000|serverUrl cannot be null.(serverUrl 不能为空.)|SERVERURL_CANNOT_NULL|DatasourceClientErrorCodeSummary|
|linkis-datasource-client |31000|version is needed!(版本为空!)|VERSION_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-datasource-client |31000|version is needed!(需要版本ID!)"|VERSIONID_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-datasource-client |31000|dataSourceId is needed!(需要dataSourceId!)|DATASOURCEID_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-datasource-client |31000|dataSourceName is needed!(需要dataSourceName!)|DATASOURCENAME_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-datasource-client |31000|user is needed!(用户为空!)|USER_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-datasource-client |31000|system is needed!(系统为空!)|SYSTEM_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-datasource-client |31000|Cannot encode the name of data source:{0} for request(无法对请求的数据源名称进行编码:{0})|CANNOT_SOURCE|DatasourceClientErrorCodeSummary|
|linkis-datasource-client |31000|database is needed!(数据库为空!)|DATABASE_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-datasource-client |31000|table is needed!(表为空!)|TABLE_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-pes-client |31000|serverUrl cannot be null.(serverUrl 不能为空.)|SERVERURL_CANNOT_NULL|DatasourceClientErrorCodeSummary|
|linkis-pes-client |31000|version is needed!(版本为空!)|VERSION_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-pes-client |31000|version is needed!(需要版本ID!)"|VERSIONID_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-pes-client |31000|dataSourceId is needed!(需要dataSourceId!)|DATASOURCEID_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-pes-client |31000|dataSourceName is needed!(需要dataSourceName!)|DATASOURCENAME_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-pes-client |31000|user is needed!(用户为空!)|USER_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-pes-client |31000|system is needed!(系统为空!)|SYSTEM_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-pes-client |31000|Cannot encode the name of data source:{0} for request(无法对请求的数据源名称进行编码:{0})|CANNOT_SOURCE|DatasourceClientErrorCodeSummary|
|linkis-pes-client |31000|database is needed!(数据库为空!)|DATABASE_NEEDED|DatasourceClientErrorCodeSummary|
|linkis-pes-client |31000|table is needed!(表为空!)|TABLE_NEEDED|DatasourceClientErrorCodeSummary|


2 changes: 1 addition & 1 deletion docs/errorcode/linkis-instance-label-errorcode.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## linkis-instance-label errorcode

| 模块名(服务名) | 错误码 | 描述 | Exception Class|
| -------- | -------- | ----- |-----|
| | -------- | ----- |-----|
|linkis-instance-label |14100|Failed to insert service instance(插入服务实例失败)|LinkisInstanceLabelErrorCodeSummary|
|linkis-instance-label |14100|Only admin can view all instances(只有管理员才能查看所有实例).|LinkisInstanceLabelErrorCodeSummary|
|linkis-instance-label |14100|Only admin can modify instance label(只有管理员才能修改标签).|LinkisInstanceLabelErrorCodeSummary|
Expand Down
Loading

0 comments on commit a4feb39

Please sign in to comment.