Merge pull request #174 from WeBankFinTech/dev-0.8.0

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

Author: liuyou2

assembly/pom.xml

@@ -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>
 
@@ -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>

bin/checkServices.sh

@@ -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

bin/install.sh

@@ -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

bin/start-all.sh

@@ -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

bin/stop-all.sh

@@ -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

conf/config.sh

@@ -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

datachecker-appjoint/pom.xml

@@ -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>
 

datachecker-appjoint/src/main/java/com/webank/wedatasphere/dss/appjoint/schedulis/jobtype/connector/DataCheckerDao.java

@@ -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("\\.");
+		String dbName = dataObjectArray[0];
+		String tableName = dataObjectArray[1];
 		if(dataScape.equals("Partition")) {
 			Pattern pattern = Pattern.compile("\\{([^\\}]+)\\}");
 			Matcher matcher = pattern.matcher(dataObject);
@@ -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);
 		}
 	}
 

docs/en_US/ch1/DataSphereStudio_Compile_Manual.md

@@ -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>

docs/en_US/ch2/Azkaban_LinkisJobType_Deployment_Manual.md

@@ -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