BIGTOP-4467: Merge tool table data into repo table

bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/grpc/service/SetupJdkServiceGrpcImpl.java

@@ -26,7 +26,7 @@
 import org.apache.bigtop.manager.grpc.generated.SetupJdkServiceGrpc;
 import org.apache.bigtop.manager.grpc.pojo.ClusterInfo;
 import org.apache.bigtop.manager.grpc.pojo.PackageInfo;
-import org.apache.bigtop.manager.grpc.pojo.ToolInfo;
+import org.apache.bigtop.manager.grpc.pojo.RepoInfo;
 import org.apache.bigtop.manager.stack.core.utils.LocalSettings;
 import org.apache.bigtop.manager.stack.core.utils.TarballUtils;
 import org.apache.bigtop.manager.stack.core.utils.linux.LinuxFileUtils;
@@ -53,17 +53,16 @@ public void setup(SetupJdkRequest request, StreamObserver<SetupJdkReply> respons
 
             log.info("Setting up cluster jdk...");
             ClusterInfo clusterInfo = LocalSettings.cluster();
-            String toolsHome = clusterInfo.getRootDir() + "/tools";
+            String dependenciesHome = clusterInfo.getRootDir() + "/dependencies";
             String user = System.getProperty("user.name");
-            LinuxFileUtils.createDirectories(toolsHome, user, user, Constants.PERMISSION_755, true);
+            LinuxFileUtils.createDirectories(dependenciesHome, user, user, Constants.PERMISSION_755, true);
 
-            String jdkHome = toolsHome + "/jdk";
-            ToolInfo tool = LocalSettings.getTool("jdk8");
+            String jdkHome = dependenciesHome + "/jdk";
+            RepoInfo repoInfo = LocalSettings.repo("jdk8");
             PackageInfo packageInfo = new PackageInfo();
-            packageInfo.setUrl(tool.getBaseUrl());
-            packageInfo.setName(tool.getPkgName());
-            packageInfo.setChecksum(tool.getChecksum());
-            TarballUtils.installPackage(null, toolsHome, jdkHome, packageInfo, 1);
+            packageInfo.setName(repoInfo.getPkgName());
+            packageInfo.setChecksum(repoInfo.getChecksum());
+            TarballUtils.installPackage(repoInfo.getBaseUrl(), dependenciesHome, jdkHome, packageInfo, 1);
             LinuxFileUtils.createDirectories(jdkHome, user, user, Constants.PERMISSION_755, true);
 
             SetupJdkReply reply = SetupJdkReply.newBuilder()

bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/RepoPO.java

@@ -43,4 +43,13 @@ public class RepoPO extends BasePO implements Serializable {
 
     @Column(name = "base_url")
     private String baseUrl;
+
+    @Column(name = "pkg_name")
+    private String pkgName;
+
+    @Column(name = "checksum")
+    private String checksum;
+
+    @Column(name = "type")
+    private Integer type;
 }

bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/RepoDao.java

@@ -21,4 +21,9 @@
 
 import org.apache.bigtop.manager.dao.po.RepoPO;
 
-public interface RepoDao extends BaseDao<RepoPO> {}
+import org.apache.ibatis.annotations.Param;
+
+public interface RepoDao extends BaseDao<RepoPO> {
+
+    RepoPO findByName(@Param("name") String name);
+}

bigtop-manager-dao/src/main/resources/mapper/mysql/RepoMapper.xml

@@ -24,6 +24,18 @@
 <mapper namespace="org.apache.bigtop.manager.dao.repository.RepoDao">
 
     <sql id="baseColumns">
-        id, name, arch, base_url, type
+        id, name, arch, base_url, pkg_name, checksum, type
     </sql>
-</mapper>
+    <sql id="baseColumnsV2">
+        ${alias}.id, ${alias}.name, ${alias}.arch, ${alias}.base_url, ${alias}.pkg_name, ${alias}.checksum, ${alias}.type
+    </sql>
+
+    <select id="findByName" resultType="org.apache.bigtop.manager.dao.po.RepoPO">
+        select
+        <include refid="baseColumns"/>
+        from
+        repo
+        where name = #{name}
+        limit 1
+    </select>
+</mapper>

bigtop-manager-dao/src/main/resources/mapper/postgresql/RepoMapper.xml

@@ -24,6 +24,18 @@
 <mapper namespace="org.apache.bigtop.manager.dao.repository.RepoDao">
 
     <sql id="baseColumns">
-        id, name, arch, base_url, type
+        id, name, arch, base_url, pkg_name, checksum, type
     </sql>
-</mapper>
+    <sql id="baseColumnsV2">
+        ${alias}.id, ${alias}.name, ${alias}.arch, ${alias}.base_url, ${alias}.pkg_name, ${alias}.checksum, ${alias}.type
+    </sql>
+
+    <select id="findByName" resultType="org.apache.bigtop.manager.dao.po.RepoPO">
+        select
+        <include refid="baseColumns"/>
+        from
+        repo
+        where name = #{name}
+        limit 1
+    </select>
+</mapper>

bigtop-manager-grpc/src/main/java/org/apache/bigtop/manager/grpc/pojo/ClusterInfo.java

@@ -20,8 +20,6 @@
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class ClusterInfo {
 
@@ -30,6 +28,4 @@ public class ClusterInfo {
     private String userGroup;
 
     private String rootDir;
-
-    private List<ToolInfo> tools;
 }

bigtop-manager-grpc/src/main/java/org/apache/bigtop/manager/grpc/pojo/PackageInfo.java

@@ -27,8 +27,6 @@
 @NoArgsConstructor
 public class PackageInfo {
 
-    private String url;
-
     private String name;
 
     private String checksum;

bigtop-manager-grpc/src/main/java/org/apache/bigtop/manager/grpc/pojo/RepoInfo.java

@@ -32,4 +32,10 @@ public class RepoInfo {
     private String arch;
 
     private String baseUrl;
+
+    private String pkgName;
+
+    private String checksum;
+
+    private Integer type;
 }