Revert "datachecker 支持 qualitis v4"

This reverts commit cc56750.

Author: zqburde

dss-appconn/appconns/dss-datachecker-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/datachecker/connector/DataCheckerDao.java

@@ -135,7 +135,7 @@ public boolean validateTableStatusFunction(Properties props, Logger log, RefExec
                     .parallelStream()
                     .map(proObjectMap -> {
                         log.info("Begin to Check dataObject:" + proObjectMap.entrySet().toString());
-                        boolean checkRes = getDataCheckResult(proObjectMap, jobConn, bdpConn, dopsConn, props, log,action,qualitisUtil);
+                        boolean checkRes = getDataCheckResult(proObjectMap, jobConn, bdpConn, dopsConn, props, log,qualitisUtil);
                         if (null != action.getExecutionRequestRefContext()) {
                             if (checkRes) {
                                 action.getExecutionRequestRefContext().appendLog("Database table partition info : " + proObjectMap.get(DataChecker.DATA_OBJECT) + " has arrived");
@@ -176,7 +176,6 @@ private boolean getDataCheckResult(Map<String, String> proObjectMap,
                                        Connection dopsConn,
                                        Properties props,
                                        Logger log,
-                                       RefExecutionAction action,
                                        QualitisUtil qualitisUtil ) {
         String dataObjectStr = proObjectMap.get(DataChecker.DATA_OBJECT) == null ? "" : proObjectMap.get(DataChecker.DATA_OBJECT);
         if (StringUtils.isNotBlank(dataObjectStr)) {
@@ -207,31 +206,19 @@ private boolean getDataCheckResult(Map<String, String> proObjectMap,
         Predicate<Map<String, String>> isCheckMask = (hasDataSource.and(isBdpDataSource)).or(hasNotDataSource.and(isOdsDB));
         boolean normalCheck;
         if (isCheckMetadata.test(proObjectMap)) {
-            if (null != action.getExecutionRequestRefContext()){
-                action.getExecutionRequestRefContext().appendLog("start to check hive meta");
-            }
             proObjectMap.put(DataChecker.SOURCE_TYPE, HIVE_SOURCE_TYPE);
             normalCheck= getJobTotalCount(dataObject, jobConn, log) > 0;
-            if (null != action.getExecutionRequestRefContext()){
-                action.getExecutionRequestRefContext().appendLog("check hive meta end,check result:"+normalCheck);
-            }
 
         } else {
             if (isCheckMask.test(proObjectMap)) {
-                if (null != action.getExecutionRequestRefContext()){
-                    action.getExecutionRequestRefContext().appendLog("start to check maskis");
-                }
                 proObjectMap.put(DataChecker.SOURCE_TYPE, MASK_SOURCE_TYPE);
                 normalCheck= (getBdpTotalCount(dataObject, bdpConn, log, props) > 0 || "success".equals(fetchMaskCode(dataObject, log, props).get("maskStatus")));
-                if (null != action.getExecutionRequestRefContext()){
-                    action.getExecutionRequestRefContext().appendLog("check maskis end,check result:"+normalCheck);
-                }
             }else {
                 normalCheck = false;
             }
         }
         return normalCheck
-                && checkQualitisData( objectNum,dataObject, log, action, props, dopsConn,qualitisUtil);
+                && checkQualitisData( objectNum,dataObject, log, props, dopsConn,qualitisUtil);
 
     }
 
@@ -452,18 +439,13 @@ private int checkDops(CheckDataObject dataObject, Connection conn, Logger log){
     /**
      * 从qualitis去check数据
      */
-    private boolean checkQualitisData(String objectNum,CheckDataObject dataObject, Logger log, RefExecutionAction action,Properties props,Connection conn, QualitisUtil qualitisUtil) {
+    private boolean checkQualitisData(String objectNum,CheckDataObject dataObject, Logger log, Properties props,Connection conn, QualitisUtil qualitisUtil) {
         boolean systemCheck = Boolean.valueOf(props.getProperty(DataChecker.QUALITIS_SWITCH));
         String userCheckDefault=props.getProperty(DataChecker.QUALITIS_CHECK_DEFAULT);
         boolean userCheck = Boolean.valueOf(props.getProperty(DataChecker.QUALITIS_CHECK, userCheckDefault));
         if (systemCheck && userCheck ) {
-            if (null != action.getExecutionRequestRefContext()){
-                action.getExecutionRequestRefContext().appendLog("start to check dops");
-            }
+
             int dopsState=checkDops(dataObject,conn,log);
-            if (null != action.getExecutionRequestRefContext()){
-                action.getExecutionRequestRefContext().appendLog("check dops end,check result:"+dopsState);
-            }
             if(dopsState==0){
                 //没找到记录，直接通过校验
                 return true;
@@ -472,9 +454,6 @@ private boolean checkQualitisData(String objectNum,CheckDataObject dataObject, L
                 return false;
             }
             // 其他情况，继续走qualitis校验
-            if (null != action.getExecutionRequestRefContext()){
-                action.getExecutionRequestRefContext().appendLog("start to check qualitis");
-            }
             log.info(
                     "=============================Data Check Qualitis Start==========================================");
             try {
@@ -487,7 +466,7 @@ private boolean checkQualitisData(String objectNum,CheckDataObject dataObject, L
                 String applicationId = qualitisUtil
                         .createAndSubmitRule(dataObject,projectName,ruleName,user);
                 if (StringUtils.isEmpty(applicationId)) {
-                    throw new SQLException("applicationId is empty");
+                    return false;
                 }
                 long startTime = System.currentTimeMillis();
                 while (System.currentTimeMillis() - startTime < Integer
@@ -506,28 +485,16 @@ private boolean checkQualitisData(String objectNum,CheckDataObject dataObject, L
                             }
                             break;
                         case 4:
-                            if (null != action.getExecutionRequestRefContext()){
-                                action.getExecutionRequestRefContext().appendLog("check qualitis end,check result:true");
-                            }
                             return true;
                         default:
-                            if (null != action.getExecutionRequestRefContext()){
-                                action.getExecutionRequestRefContext().appendLog("check qualitis end,check result:false");
-                            }
                             return false;
                     }
 
                 }
-                if (null != action.getExecutionRequestRefContext()){
-                    action.getExecutionRequestRefContext().appendLog("check qualitis time out,check result set to false");
-                }
                 log.info(
                         "=============================Data Check Qualitis time out==========================================");
                 return false;
             } catch (Exception e) {
-                if (null != action.getExecutionRequestRefContext()){
-                    action.getExecutionRequestRefContext().appendLog("check qualitis failed,check result set to false.cause by:"+e.getMessage());
-                }
                 log.error("get datachecker result from qualitis failed", e);
                 return false;
             }