From a3793be7dabb7aa84eb518b592d82860a1cc3003 Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Tue, 4 Aug 2020 15:04:56 +0800
Subject: [PATCH] [Fix-3390][server]Running hive sql task need find the hdfs
 path correctly (#3396)

* [Fix-3390][api]Running hive sql task need find the hdfs path correctly

* [Fix-3390][api]Running hive sql task need find the hdfs path correctly

* update soft version
---
 .../common/process/ResourceInfo.java           | 18 ------------------
 .../server/utils/UDFUtils.java                 |  6 ++++--
 sql/soft_version                               |  2 +-
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java
index c460354fe5..287f7267bc 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java
@@ -42,22 +42,4 @@ public class ResourceInfo {
   public void setRes(String res) {
     this.res = res;
   }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    ResourceInfo that = (ResourceInfo) o;
-
-    if (id != that.id) return false;
-    return res.equals(that.res);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = id;
-    result = 31 * result + res.hashCode();
-    return result;
-  }
 }
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java
index 3a8c8fe7d6..1bc79ab94e 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java
@@ -70,14 +70,16 @@ public class UDFUtils {
      */
     private static void buildJarSql(List<String> sqls, Map<UdfFunc,String> udfFuncTenantCodeMap) {
         String defaultFS = HadoopUtils.getInstance().getConfiguration().get(Constants.FS_DEFAULTFS);
-
+        String resourceFullName;
         Set<Map.Entry<UdfFunc,String>> entries = udfFuncTenantCodeMap.entrySet();
         for (Map.Entry<UdfFunc,String> entry:entries){
             String uploadPath = HadoopUtils.getHdfsUdfDir(entry.getValue());
             if (!uploadPath.startsWith("hdfs:")) {
                 uploadPath = defaultFS + uploadPath;
             }
-            sqls.add(String.format("add jar %s%s", uploadPath, entry.getKey().getResourceName()));
+            resourceFullName = entry.getKey().getResourceName();
+            resourceFullName = resourceFullName.startsWith("/") ? resourceFullName : String.format("/%s",resourceFullName);
+            sqls.add(String.format("add jar %s%s", uploadPath, resourceFullName));
         }
 
     }
diff --git a/sql/soft_version b/sql/soft_version
index 6261a05bb0..d5e98f723f 100644
--- a/sql/soft_version
+++ b/sql/soft_version
@@ -1 +1 @@
-1.3.1
\ No newline at end of file
+1.3.2
\ No newline at end of file