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.

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

Dev 0.8.0 has been developed and tested. It is requested to join the master branch and release the version. #174

Merged
merged 41 commits into from
Jun 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
c532ece
Merge pull request #3 from WeBankFinTech/master
liuyou2 Feb 10, 2020
458fbdf
Update install.sh
5herhom Feb 18, 2020
2164eb6
Update checkServices.sh
5herhom Feb 18, 2020
c8aa755
Update install.sh
5herhom Feb 18, 2020
3a4d969
Update start-all.sh
5herhom Feb 18, 2020
8c571cf
Update stop-all.sh
5herhom Feb 18, 2020
2733feb
Update config.sh
5herhom Feb 18, 2020
a5fa2fb
Update DSS快速安装使用文档.md
5herhom Feb 18, 2020
4c818a0
Update DSS Quick Installation Guide.md
5herhom Feb 18, 2020
af7676b
#116
SelfImpr001 Mar 15, 2020
b953457
Merge pull request #5 from WeBankFinTech/master
zwx-master Jun 3, 2020
ca6bcd3
sql and pyspark associate script
zwx-master Jun 3, 2020
7c60f64
Merge pull request #6 from WeBankFinTech/master
zwx-master Jun 11, 2020
0b781b2
Merge pull request #4 from WeBankFinTech/master
liuyou2 Jun 11, 2020
1c6af90
OpenFile interface data modification
zwx-master Jun 12, 2020
05dd392
Merge pull request #147 from zwx-master/master
liuyou2 Jun 12, 2020
60362be
Add default value for eventcheck parameter: msg.body
zwx-master Jun 18, 2020
9105cac
Result set sorting
zwx-master Jun 18, 2020
42cd5ae
query tab name editfy
zwx-master Jun 18, 2020
6f30f32
Merge pull request #155 from zwx-master/master
liuyou2 Jun 19, 2020
9faeb20
Merge pull request #5 from WeBankFinTech/dev-0.8.0
liuyou2 Jun 19, 2020
8a72240
Fix the bug for check table error when dataObject is not well-formed
liuyou2 Jun 19, 2020
97625ba
Merge branch 'master' into dev-0.8.0
liuyou2 Jun 19, 2020
2ee72d9
flow runtime execute cost time is not correct
liuyou2 Jun 19, 2020
041c414
The script in the workflow has been executed, but the execution time …
liuyou2 Jun 19, 2020
cf84655
run_date variable can not be shown correctly
liuyou2 Jun 19, 2020
f632fbb
Merge pull request #163 from liuyou2/dev-0.8.0
liuyou2 Jun 19, 2020
1fb288f
Merge pull request #6 from WeBankFinTech/dev-0.8.0
liuyou2 Jun 19, 2020
e7e6ffe
'utf-8' is not a valid value for the Content-Encoding header
Jun 22, 2020
223856f
Update DSS with linkis version 0.9.4 and solves some compilation errors
liuyou2 Jun 22, 2020
53db7a9
Update DSS with linkis version 0.9.4 and solves some compilation errors
liuyou2 Jun 22, 2020
dccc02e
Merge pull request #169 from liuyou2/dev-0.8.0
liuyou2 Jun 22, 2020
d657d19
Merge pull request #107 from 5herhom/branch-0.7.1
liuyou2 Jun 22, 2020
8d85b81
Merge pull request #117 from SelfImpr001/master
liuyou2 Jun 22, 2020
ea4a482
Merge pull request #167 from iBuddha/master
liuyou2 Jun 22, 2020
c8f78db
Merge pull request #7 from WeBankFinTech/dev-0.8.0
liuyou2 Jun 22, 2020
8216821
Update DSS with linkis version 0.9.4 and solves some compilation errors
liuyou2 Jun 24, 2020
02e0fa0
Merge pull request #170 from liuyou2/dev-0.8.0
liuyou2 Jun 24, 2020
e197816
New workspace, case, quick start code
zwx-master Jun 19, 2020
af739cd
delete workspace
zwx-master Jun 22, 2020
159588d
readOnly value modification
zwx-master Jun 24, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>dss</artifactId>
<groupId>com.webank.wedatasphere.dss</groupId>
<version>0.7.0</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -103,7 +103,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.6</version>
<version>2.10.0</version>
</dependency>
<dependency>
<groupId>net.databinder.dispatch</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bin/checkServices.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ MICRO_SERVICE_PORT=$3

local_host="`hostname --fqdn`"

ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')

function isLocal(){
if [ "$1" == "127.0.0.1" ];then
Expand Down
2 changes: 1 addition & 1 deletion bin/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ source ${DISTRIBUTION}
isSuccess "load config"

local_host="`hostname --fqdn`"
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')

function isLocal(){
if [ "$1" == "127.0.0.1" ];then
Expand Down
2 changes: 1 addition & 1 deletion bin/start-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ fi
}
local_host="`hostname --fqdn`"

ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')

function isLocal(){
if [ "$1" == "127.0.0.1" ];then
Expand Down
2 changes: 1 addition & 1 deletion bin/stop-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export DISTRIBUTION=${DISTRIBUTION:-"${CONF_DIR}/config.sh"}
source ${DISTRIBUTION}

local_host="`hostname --fqdn`"
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')

function isSuccess(){
if [ $? -ne 0 ]; then
Expand Down
2 changes: 1 addition & 1 deletion conf/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ AZKABAN_ADRESS_PORT=8081
QUALITIS_ADRESS_IP=127.0.0.1
QUALITIS_ADRESS_PORT=8090

DSS_VERSION=0.7.0
DSS_VERSION=0.8.0
2 changes: 1 addition & 1 deletion datachecker-appjoint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>dss</artifactId>
<groupId>com.webank.wedatasphere.dss</groupId>
<version>0.7.0</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,9 @@ private long getTotalCount(Map<String, String> proObjectMap, Connection conn, L

private PreparedStatement getStatement(Connection conn, String dataObject) throws SQLException {
String dataScape = dataObject.contains("{") ? "Partition" : "Table";
String dbName = dataObject.split("\\.")[0];
String tableName = dataObject.split("\\.")[1];
String[] dataObjectArray = dataObject.split("\\.");
liuyou2 marked this conversation as resolved.
Show resolved Hide resolved
String dbName = dataObjectArray[0];
String tableName = dataObjectArray[1];
if(dataScape.equals("Partition")) {
Pattern pattern = Pattern.compile("\\{([^\\}]+)\\}");
Matcher matcher = pattern.matcher(dataObject);
Expand All @@ -174,11 +175,13 @@ private PreparedStatement getStatement(Connection conn, String dataObject) throw
pstmt.setString(2, tableName);
pstmt.setString(3, partitionName);
return pstmt;
} else {
} else if(dataObjectArray.length == 2){
PreparedStatement pstmt = conn.prepareCall(SQL_SOURCE_TYPE_JOB_TABLE);
pstmt.setString(1, dbName);
pstmt.setString(2, tableName);
return pstmt;
}else {
throw new SQLException("Incorrect input format for dataObject "+ dataObject);
}
}

Expand Down
4 changes: 2 additions & 2 deletions docs/en_US/ch1/DataSphereStudio_Compile_Manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

```xml
<properties>
<dss.version>0.7.0</dss.version>
<linkis.version>0.9.3</linkis.version>
<dss.version>0.8.0</dss.version>
<linkis.version>0.9.4</linkis.version>
<scala.version>2.11.8</scala.version>
<jdk.compile.version>1.8</jdk.compile.version>
<maven.version>3.3.3</maven.version>
Expand Down
2 changes: 1 addition & 1 deletion docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 1. Ready work
1.Click [release](https://github.com/WeBankFinTech/DataSphereStudio/releases/download/0.7.0/linkis-jobtype-0.7.0.zip) to select the corresponding installation package to download:
1.Click [release](https://github.com/WeBankFinTech/DataSphereStudio/releases/download/0.8.0/linkis-jobtype-0.8.0.zip) to select the corresponding installation package to download:

- linkis-jobtype-$version.zip

Expand Down
8 changes: 4 additions & 4 deletions docs/en_US/ch2/DSS Quick Installation Guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ DSS also implements the integration of many external systems, such as [Qualitis]
DSS environment configuration can be divided into three steps, including basic software installation, backend environment configuration, and frontend environment configuration. The details are as below:

### 2.1 Frontend and backend basic software installation
Linkis standard version (above 0.9.3). How to install [Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)
Linkis standard version (above 0.9.4). How to install [Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)

JDK (above 1.8.0_141). How to install [JDK](https://www.runoob.com/java/java-environment-setup.html)

Expand Down Expand Up @@ -103,15 +103,15 @@ dss_port="8088"
linkis_url="http://127.0.0.1:9001"
# dss ip address
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
```

The environment is ready, click me to enter ****[4. Installation and use](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/en_US/ch2/DSS%20Quick%20Installation%20Guide.md#four-installation-and-use)**

## Three Standard DSS environment configuration preparation
The standard DSS environment preparation is also divided into three parts, the frontEnd-end and back-end basic software installation, back-end environment preparation, and frontEnd-end environment preparation. The details are as follows:
### 3.1 frontEnd and BackEnd basic software installation
Linkis standard version (above 0.9.3), [How to install Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)
Linkis standard version (above 0.9.4), [How to install Linkis](https://github.com/WeBankFinTech/Linkis/blob/master/docs/en_US/ch1/deploy.md)

JDK (above 1.8.0_141), How to install [JDK](https://www.runoob.com/java/java-environment-setup.html)

Expand Down Expand Up @@ -219,7 +219,7 @@ dss_port="8088"
linkis_url="http://127.0.0.1:9001"
# dss ip address
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
```

The environment is ready, click me to enter **[Four Installation and use](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/en_US/ch2/DSS%20Quick%20Installation%20Guide.md#four-installation-and-use)**
Expand Down
4 changes: 2 additions & 2 deletions docs/zh_CN/ch1/DSS编译文档.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

```xml
<properties>
<dss.version>0.7.0</dss.version>
<linkis.version>0.9.3</linkis.version>
<dss.version>0.8.0</dss.version>
<linkis.version>0.9.4</linkis.version>
<scala.version>2.11.8</scala.version>
<jdk.compile.version>1.8</jdk.compile.version>
<maven.version>3.3.3</maven.version>
Expand Down
12 changes: 6 additions & 6 deletions docs/zh_CN/ch2/DSS快速安装使用文档.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
## 二、精简版DSS环境配置准备
DSS环境配置准备分为三部分,前后端基础软件安装、后端环境配置准备和前端环配置境准备,详细介绍如下:
### 2.1 前后端基础软件安装
Linkis精简版(0.9.3及以上),[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
Linkis精简版(0.9.4及以上),[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)

JDK (1.8.0_141以上),[如何安装JDK](https://www.runoob.com/java/java-environment-setup.html)

Expand Down Expand Up @@ -132,7 +132,7 @@ dss_port="8088"
linkis_url="http://127.0.0.1:9001"
# dss ip address
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
```

环境准备完毕,点我进入 [五、安装和使用](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/zh_CN/ch2/DSS%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8%E6%96%87%E6%A1%A3.md#%E4%BA%94%E5%AE%89%E8%A3%85%E5%92%8C%E4%BD%BF%E7%94%A8)
Expand All @@ -143,7 +143,7 @@ dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/
## 三、简单版DSS环境配置准备
DSS环境配置准备分为三部分,前后端基础软件安装、后端环境配置准备和前端环配置境准备,详细介绍如下:
### 3.1 前后端基础软件安装
Linkis简单版(0.9.3及以上),[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
Linkis简单版(0.9.4及以上),[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)

JDK (1.8.0_141以上),[如何安装JDK](https://www.runoob.com/java/java-environment-setup.html)

Expand Down Expand Up @@ -243,15 +243,15 @@ dss_port="8088"
linkis_url="http://127.0.0.1:9001"
# dss ip address
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
```

环境准备完毕,点我进入 [五、安装和使用](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/zh_CN/ch2/DSS%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8%E6%96%87%E6%A1%A3.md#%E4%BA%94%E5%AE%89%E8%A3%85%E5%92%8C%E4%BD%BF%E7%94%A8)

## 四、标准版DSS环境配置准备
标准版DSS环境准备也分为三部分,前后端基础软件安装、后端环境准备和前端环境准备,详细介绍如下:
### 4.1 前后端基础软件安装
Linkis标准版(0.9.3及以上),[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)
Linkis标准版(0.9.4及以上),[如何安装Linkis](https://github.com/WeBankFinTech/Linkis/wiki/%E5%A6%82%E4%BD%95%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8Linkis)

JDK (1.8.0_141以上),[如何安装JDK](https://www.runoob.com/java/java-environment-setup.html)

Expand Down Expand Up @@ -365,7 +365,7 @@ dss_port="8088"
linkis_url="http://127.0.0.1:9001"
# dss ip address
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
dss_ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}'|awk 'NR==1')
```

环境准备完毕,点我进入 [五、安装和使用](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/zh_CN/ch2/DSS%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8%E6%96%87%E6%A1%A3.md#%E4%BA%94%E5%AE%89%E8%A3%85%E5%92%8C%E4%BD%BF%E7%94%A8)
Expand Down
7 changes: 6 additions & 1 deletion dss-appjoint-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>dss</artifactId>
<groupId>com.webank.wedatasphere.dss</groupId>
<version>0.7.0</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -38,6 +38,11 @@
<artifactId>linkis-common</artifactId>
<version>${linkis.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ import com.webank.wedatasphere.dss.appjoint.auth.{AppJointAuth, RedirectMsg}
import com.webank.wedatasphere.linkis.common.utils.Logging
import com.webank.wedatasphere.linkis.httpclient.dws.DWSHttpClient
import com.webank.wedatasphere.linkis.httpclient.dws.config.DWSClientConfigBuilder
import javax.servlet.http.{Cookie, HttpServletRequest}
import javax.servlet.http.HttpServletRequest
import org.apache.commons.io.IOUtils
import org.apache.http.impl.cookie.BasicClientCookie

import scala.collection.JavaConversions._

Expand Down Expand Up @@ -68,7 +69,7 @@ class AppJointAuthImpl private() extends AppJointAuth with Logging {
val index = cookie.indexOf("=")
val key = cookie.substring(0, index).trim
val value = cookie.substring(index + 1).trim
userInfoAction.addCookie(new Cookie(key, value))
userInfoAction.addCookie(new BasicClientCookie(key, value))
}
val redirectMsg = new RedirectMsgImpl
redirectMsg.setRedirectUrl(request.getParameter(AppJointAuthImpl.REDIRECT_KEY))
Expand Down
8 changes: 7 additions & 1 deletion dss-appjoint-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>dss</artifactId>
<groupId>com.webank.wedatasphere.dss</groupId>
<version>0.7.0</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -50,6 +50,12 @@
<artifactId>dss-common</artifactId>
<version>${dss.version}</version>
</dependency>

<dependency>
<groupId>com.webank.wedatasphere.linkis</groupId>
<artifactId>linkis-httpclient</artifactId>
<version>${linkis.version}</version>
</dependency>
</dependencies>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package com.webank.wedatasphere.dss.appjoint.execution.scheduler

import java.util.concurrent.ArrayBlockingQueue

import com.webank.wedatasphere.dss.appjoint.exception.AppJointErrorException
import com.webank.wedatasphere.dss.appjoint.execution.common.{AsyncNodeExecutionResponse, CompletedNodeExecutionResponse, LongTermNodeExecutionAction}
import com.webank.wedatasphere.dss.appjoint.execution.conf.NodeExecutionConfiguration._
Expand Down Expand Up @@ -55,7 +57,7 @@ class ListenerEventBusNodeExecutionScheduler(eventQueueCapacity: Int, name: Stri
val field1 = ru.typeOf[ListenerEventBus[_, _]].decl(ru.TermName("eventQueue")).asMethod
val result = listenerEventBusClass.reflectMethod(field1)
result() match {
case queue: BlockingLoopArray[AsyncNodeExecutionResponseEvent] => queue
case queue: ArrayBlockingQueue[AsyncNodeExecutionResponseEvent] => queue
}
}

Expand Down Expand Up @@ -104,18 +106,18 @@ class ListenerEventBusNodeExecutionScheduler(eventQueueCapacity: Int, name: Stri

protected def addEvent(event: AsyncNodeExecutionResponseEvent): Unit = synchronized {
listenerEventBus.post(event)
event.getResponse.getAction match {
case longTermAction: LongTermNodeExecutionAction =>
longTermAction.setSchedulerId(eventQueue.max)
case _ =>
}
// event.getResponse.getAction match {
// case longTermAction: LongTermNodeExecutionAction =>
// longTermAction.setSchedulerId(eventQueue.max)
// case _ =>
// }
}

override def removeAsyncResponse(action: LongTermNodeExecutionAction): Unit =
getAsyncResponse(action).setCompleted(true)
override def removeAsyncResponse(action: LongTermNodeExecutionAction): Unit = {

}

override def getAsyncResponse(action: LongTermNodeExecutionAction): AsyncNodeExecutionResponse =
eventQueue.get(action.getSchedulerId).getResponse
override def getAsyncResponse(action: LongTermNodeExecutionAction): AsyncNodeExecutionResponse = null

override def start(): Unit = listenerEventBus.start()

Expand Down
4 changes: 2 additions & 2 deletions dss-appjoint-loader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<parent>
<artifactId>dss</artifactId>
<groupId>com.webank.wedatasphere.dss</groupId>
<version>0.7.0</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>dss-appjoint-loader</artifactId>
<version>0.7.0</version>
<version>0.8.0</version>

<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion dss-application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>dss</artifactId>
<groupId>com.webank.wedatasphere.dss</groupId>
<version>0.7.0</version>
<version>0.8.0</version>
</parent>
<artifactId>dss-application</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion dss-azkaban-scheduler-appjoint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>dss</artifactId>
<groupId>com.webank.wedatasphere.dss</groupId>
<version>0.7.0</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ public Project createProject(Project project, Session session) throws AppJointEr
params.add(new BasicNameValuePair("name", project.getName()));
params.add(new BasicNameValuePair("description", project.getDescription()));
HttpPost httpPost = new HttpPost(projectUrl);
httpPost.addHeader(HTTP.CONTENT_ENCODING, "UTF-8");
httpPost.addHeader(HTTP.CONTENT_ENCODING, HTTP.IDENTITY_CODING);
CookieStore cookieStore = new BasicCookieStore();
cookieStore.addCookie(session.getCookies()[0]);
HttpEntity entity = EntityBuilder.create().setContentEncoding("UTF-8").
setContentType(ContentType.create("application/x-www-form-urlencoded", Consts.UTF_8))
HttpEntity entity = EntityBuilder.create()
.setContentType(ContentType.create("application/x-www-form-urlencoded", Consts.UTF_8))
.setParameters(params).build();
httpPost.setEntity(entity);
CloseableHttpClient httpClient = null;
Expand Down
2 changes: 1 addition & 1 deletion dss-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>dss</artifactId>
<groupId>com.webank.wedatasphere.dss</groupId>
<version>0.7.0</version>
<version>0.8.0</version>
</parent>
<artifactId>dss-common</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion dss-flow-execution-entrance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>dss</artifactId>
<groupId>com.webank.wedatasphere.dss</groupId>
<version>0.7.0</version>
<version>0.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading