Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Feature][linkis-public-enhancements] Merge pes client and common #4853

Merged
merged 5 commits into from
Aug 7, 2023
Merged

[Feature][linkis-public-enhancements] Merge pes client and common #4853

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e128f4f
merge pes client and common
GuoPhilipse Aug 6, 2023
fcec336
fix cs common
GuoPhilipse Aug 6, 2023
bb3ae07
optimize import
GuoPhilipse Aug 7, 2023
c4d40d1
optimize import
GuoPhilipse Aug 7, 2023
db2777d
rename module linkis-rpc-client to be linkis-pes-rpc-client
GuoPhilipse Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions docs/configuration/linkis-instance-label-client.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## linkis-instance-label-client 配置
## linkis-rpc-client 配置

| 模块名(服务名) | 参数名 | 默认值 | 描述 |
| -------- | -------- | ----- |----- |
| linkis-instance-label-client |wds.linkis.instance.label.server.name|linkis-ps-publicservice|instance.label.server.name|
| 模块名(服务名) | 参数名 | 默认值 | 描述 |
|-------------------| -------- | ----- |----- |
| linkis-rpc-client |wds.linkis.instance.label.server.name|linkis-ps-publicservice|instance.label.server.name|
12 changes: 6 additions & 6 deletions docs/errorcode/linkis-bml-client.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-bml-client</artifactId>
<artifactId>linkis-pes-client</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand Down
4 changes: 2 additions & 2 deletions ...computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-udf-client</artifactId>
<artifactId>linkis-rpc-client</artifactId>
GuoPhilipse marked this conversation as resolved.
Show resolved Hide resolved
<version>${project.version}</version>
</dependency>

Expand All @@ -55,7 +55,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-bml-client</artifactId>
<artifactId>linkis-pes-client</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion ...n-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-bml-client</artifactId>
<artifactId>linkis-pes-client</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
20 changes: 6 additions & 14 deletions linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-udf-client</artifactId>
<artifactId>linkis-rpc-client</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down Expand Up @@ -60,18 +60,6 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cs-client</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-computation-governance-common</artifactId>
Expand All @@ -80,9 +68,13 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-bml-client</artifactId>
<artifactId>linkis-pes-client</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand Down
16 changes: 2 additions & 14 deletions linkis-computation-governance/linkis-entrance/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cs-client</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-error-code-client</artifactId>
<artifactId>linkis-pes-client</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -92,13 +86,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-bml-client</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-instance-label-client</artifactId>
<artifactId>linkis-rpc-client</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-bml-client</artifactId>
<artifactId>linkis-pes-client</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand Down
2 changes: 1 addition & 1 deletion linkis-engineconn-plugins/jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-datasource-client</artifactId>
<artifactId>linkis-pes-client</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand Down
2 changes: 1 addition & 1 deletion linkis-engineconn-plugins/spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
</dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-datasource-client</artifactId>
<artifactId>linkis-pes-client</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand Down
43 changes: 0 additions & 43 deletions linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-bml-common</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions linkis-public-enhancements/linkis-bml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@

<packaging>pom</packaging>
<modules>
<module>linkis-bml-common</module>
<module>linkis-bml-server</module>
<module>linkis-bml-client</module>
</modules>

</project>
45 changes: 0 additions & 45 deletions linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml
View file
Open in desktop

This file was deleted.

10 changes: 2 additions & 8 deletions linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cs-common</artifactId>
<artifactId>linkis-pes-common</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -41,13 +41,7 @@

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-cs-listener</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.linkis</groupId>
<artifactId>linkis-instance-label-client</artifactId>
<artifactId>linkis-rpc-client</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
Loading
Loading