WebSVN – DevTools – Diff – /buildtool/trunk/src/main/java/com/erggroup/buildtool/ripple/ReleaseManager.java

             try
+            {
                 connect();
                 CallableStatement stmt = mConnection.prepareCall(
                     "delete from release_manager.planned_versions" +
-                    " where pkg_id=" + mPlannedPkgId +
+                    " where pkg_id=? and pkg_version=?");
+                stmt.setString(1, mPlannedPkgId);
-                    "   and pkg_version='" + mPlannedPkgVersion + "'");
+                stmt.setString(2, mPlannedPkgVersion);
                 stmt.executeUpdate();
                 stmt.close();
                 commit();
                 mPlannedPkgId = null;
                 mPlannedPkgVersion = null;
                 CallableStatement stmt4 = mConnection.prepareCall(
                         "update release_manager.run_level" +
                         " set current_pkg_id_being_built=NULL,"+
                         "     current_pv_id=NULL," +
                         "     current_build_files=NULL" +
-                        " where rcon_id=" + rconId
+                        " where rcon_id=?"
                          );
+                stmt4.setInt(1, rconId);
                 stmt4.executeUpdate();
                 stmt4.close();
                 commit();
+            }
             catch ( SQLException e )
             stmt.setLong(2, buildId);
             Clob myClob = mConnection.createClob();
             for (int ii = 0; ii < btr.mTestResults.size(); ii++)
+            {
-                //System.out.println("Data: " +data.testResults.get(ii).toString());
                 BuildTestResults.testResultData td = btr.mTestResults.get(ii);
                 if (td.platform != null)
+                {
                     stmt.setString(3, td.testName);
                     stmt.setString(4, td.outcome);
                     //
                     //  Convert userId into an email address
                     //
                     CallableStatement stmt1 = mConnection.prepareCall(
-                            "select user_email from release_manager.users where user_id=" + di.userId);
+                            "select user_email from release_manager.users where user_id=?");
+                    stmt1.setInt(1, di.userId);
                     ResultSet rset1 = stmt1.executeQuery();
                     while( rset1.next() )
+                    {
                         di.userEmail = rset1.getString("user_email");
      */
     public int queryRtagIdForSbom(int sbom_id) throws SQLException
+    {
         int rtagId = 0;
-        CallableStatement stmt = mConnection.prepareCall("select b.rtag_id_fk from deployment_manager.boms b where b.bom_id=" + sbom_id);
+        CallableStatement stmt = mConnection.prepareCall("select b.rtag_id_fk from deployment_manager.boms b where b.bom_id=?");
+        stmt.setInt(1, sbom_id);
         ResultSet rset = stmt.executeQuery();
         while( rset.next() )
+        {
             rtagId = rset.getInt("rtag_id_fk");
+        }
         if ( mDaemon )
+        {
             sql = "select p.proj_name, rt.rtag_name" +
                   " from release_manager.projects p, release_manager.release_tags rt" +
-                  " where rt.rtag_id=" + baseline + " and p.proj_id=rt.proj_id";
+                  " where rt.rtag_id=? and p.proj_id=rt.proj_id";
+        }
         else
+        {
             sql = "select dp.proj_name, br.branch_name, b.bom_version, b.bom_lifecycle" +
                   " from deployment_manager.dm_projects dp, deployment_manager.branches br, deployment_manager.boms b" +
-                  " where b.bom_id=" + baseline + " and br.branch_id=b.branch_id and dp.proj_id=br.proj_id";
+                  " where b.bom_id=? and br.branch_id=b.branch_id and dp.proj_id=br.proj_id";
+        }
         try
+        {
             CallableStatement stmt = mConnection.prepareCall(sql);
+            stmt.setInt(1, baseline);
             ResultSet rset = stmt.executeQuery();
             while( rset.next() )
+            {
                 String proj_name = rset.getString("proj_name");
                         "from release_manager.autobuild_failure af, " +
                         "release_manager.members_group mg, " +
                         "release_manager.users u, " +
                         "release_manager.views v, " +
                         "release_manager.release_tags rt " +
-                        "where rt.rtag_id=" + baseline + " " +
+                        "where rt.rtag_id=? " +
                         "and v.view_name='PROJECT WIDE' " +
                         "and af.proj_id=rt.proj_id " +
                         "and af.view_id=v.view_id " +
                         "and mg.group_email_id=af.group_email_id " +
                         "and u.user_id=mg.user_id"
                 );
+        stmt0.setInt(1, baseline);
         ResultSet rset0 = stmt0.executeQuery();
         while( rset0.next() )
+        {
             String email = rset0.getString("user_email");
         rset0.close();
         stmt0.close();
         //  Fetch the Release Specific email address
         //  It may be comma separated
-        CallableStatement stmt1 = mConnection.prepareCall(
-                "select owner_email from release_manager.release_tags rt where rt.rtag_id = " + baseline
+        CallableStatement stmt1 = mConnection.prepareCall("select owner_email from release_manager.release_tags rt where rt.rtag_id = ?" );
-                );
+        stmt1.setInt(1, baseline);
         ResultSet rset1 = stmt1.executeQuery();
         while( rset1.next() )
+        {
             String email = rset1.getString("owner_email");
             connect();
             CallableStatement stmt = mConnection.prepareCall(
                     "update release_manager.run_level" +
                     " set current_build_files=NULL" +
-                    " where rcon_id=" + rcon_id
+                    " where rcon_id=?"
                     );
+            stmt.setInt(1, rcon_id);
             stmt.executeUpdate();
             stmt.close();
             commit();
+        }
         catch ( SQLException e )
+            {
                 connect();
                 mLogger.info("queryReleaseSeqNum queryReleaseSeqNum");
                 CallableStatement stmt = mConnection.prepareCall(
                         "SELECT NVL(rl.pause,0) AS pause, " +
-                                "(select seqnum from release_modified where rtag_id = "+ rtagId +") as seqnum" +
+                                "(select seqnum from release_modified where rtag_id = ?) as seqnum" +
                                 " FROM run_level rl," +
                                 "  release_config rc," +
                                 "  BUILD_MACHINE_CONFIG bmc" +
-                                " WHERE rl.rcon_id = " + rcon_id +
+                                " WHERE rl.rcon_id = ?" +
                                 " AND rl.RCON_ID   = rc.RCON_ID" +
                                 " AND rc.BMCON_ID IS NOT NULL" +
                                 " AND rc.BMCON_ID = bmc.BMCON_ID" +
                                 " AND rc.DAEMON_MODE = 'M'" +
-                                " AND UPPER(bmc.MACHINE_HOSTNAME) = UPPER('"+machine_hostname+"')"
+                                " AND UPPER(bmc.MACHINE_HOSTNAME) = UPPER(?)"
                                 );
+                stmt.setInt(1, rtagId);
+                stmt.setInt(2, rcon_id);
+                stmt.setString(3, machine_hostname);
                 ResultSet rset = stmt.executeQuery();
                 if( rset.next() )
+                {
                     int pause = rset.getInt("pause");
                     if (pause > 1)
+        {
             // check if the rcon_id is still configured
             CallableStatement stmt = mConnection.prepareCall(
                     "select rtag_id"
                     + " from release_manager.release_config"
-                    + " where rtag_id=" + rtag_id
+                    + " where rtag_id=?"
                     + " AND bmcon_id is not NULL");
+            stmt.setInt(1, rtag_id);
             ResultSet rset = stmt.executeQuery();
             while( rset.next() )
+            {
                 retVal = true;
             try
+            {
                 CallableStatement stmt = mConnection.prepareCall(
                         "select NVL(rl.pause,0) as pause" +
                         " from release_manager.run_level rl, release_manager.release_config rc "+
-                        " where rl.rcon_id=" + rcon_id +
+                        " where rl.rcon_id=?" +
                         " and rl.RCON_ID = rc.RCON_ID" +
                         " and rc.BMCON_ID is not NULL"
                         );
+                stmt.setInt(1, rcon_id);
                 ResultSet rset = stmt.executeQuery();
                 int rsetSize = 0;
                 while( rset.next() )
+                {
+        {
             connect();
             CallableStatement stmt = mConnection.prepareCall(
                             "SELECT COUNT (rc.daemon_mode) as masterCount" +
                             " FROM release_manager.release_config rc, release_manager.run_level rl" +
-                            " WHERE rc.rtag_id =" + rtag_id +
+                            " WHERE rc.rtag_id = ?" +
                             " AND rl.RCON_ID = rc.RCON_ID" +
                             " AND   rc.bmcon_id is not NULL" +
                             " AND NVL(rl.PAUSE,0) != 2" +
                             " GROUP BY rc.daemon_mode" +
                             " HAVING rc.daemon_mode = 'M'" );
+            stmt.setInt(1, rtag_id);
             ResultSet rset = stmt.executeQuery();
             if ( rset.next() )
+            {
                 masterCount = rset.getInt("masterCount");
             int patch_limit = rset1.getInt("patch_limit",0);
             int build_number_limit = rset1.getInt("build_number_limit",0);
             String vcs_tag = rset1.getString("vcsTag", "");
             if ( useChangeType ) {
+                //  WIP - Change type is significant
+                //        The next version number will be based on the previous version number of the package
                 p = new Package(pkg_id, pv_id, pkg_name, pkg_version, v_ext, pkg_name + v_ext, vcs_tag, ripple_field.charAt(0), ct);
+                p.mPrevVersion = pkg_prevVersion;
             } else {
+                //  RIPPLE/TEST - Change type is not significant
+                //                Next version number will will be based on the current version number
                 p = new Package(pkg_id, pv_id, pkg_name, pkg_version, v_ext, pkg_name + v_ext, vcs_tag, ripple_field.charAt(0));
+            }
             p.mMajorLimit = major_limit;
             p.mMinorLimit = minor_limit;
             p.mPatchLimit = patch_limit;
             p.mBuildLimit = build_number_limit;
-            p.mPrevVersion = pkg_prevVersion;
             p.mBuildTime = buildTime;
             rset1.close();
             stmt1.close();
+        }
         return p;
+    }
+    /** Extract PlanControl data for a specific release
+     *
+     *  Overridden in ReleaseManagerUtf
+     *
+     * @param mRtagId - Release to process
+     * @param mPlanControl  - Data is inserted into this object
+     * @throws Exception
+     */
+    public void queryPlanControl(int mRtagId, PlanControl mPlanControl) throws Exception {
+        mLogger.debug("queryPlanControl {}", mRtagId);
+        if ( mUseDatabase )
+        {
+            try
+            {
+                CallableStatement stmt = mConnection.prepareCall(
+                        "SELECT PLAN_THRESHOLD, PLAN_DROP" +
+                        " FROM release_manager.release_tags rt" +
+                        " WHERE rt.rtag_id  = ?"
+                        );
+                stmt.setInt(1, mRtagId);
+                RmResultSet rset = new RmResultSet(stmt.executeQuery(), "queryPlanControl");
+                if( rset.next() )
+                {
+                    mPlanControl.setThreshold(rset.mustGetInt("PLAN_THRESHOLD"));
+                    mPlanControl.setDumpPlan(rset.mustGetString("PLAN_DROP"));
+                } else
+                {
+                    mLogger.error("queryPlanControl did not return data");
+                    // show stopper
+                    throw new Exception("queryPlanControl did not return data");
+                }
+                rset.close();
+                stmt.close();
+            }
+            catch ( SQLException e )
+            {
+                handleSQLException(e, "");
+            }
+        }
+        mLogger.info("queryPlanControl {}", mPlanControl);
+    }
     /**	Determine the version number of the base package
     *   Used in a ripple build to determine the base for calculating the next version number
     *   Assumes that a database connection has been established
     *   Used in Daemon Mode Only
+    *
 					"    (SELECT pv.build_type,pv.last_pv_id AS raw_last_pvid ,pv_id,pv.pkg_version,pv.v_ext,DECODE(pv.pv_id, pv.last_pv_id, NULL, pv.last_pv_id) AS last_pv_id, DLOCKED " +
 					"    FROM release_manager.package_versions pv " +
 					"    WHERE pv.PKG_ID IN " +
 					"      (SELECT pkg_id " +
 					"      FROM release_manager.package_versions pv " +
-					"      WHERE pv.pv_id = " + pv_id +
+					"      WHERE pv.pv_id = ?" +
 					"      ) " +
 					"    ) " +
-					"    START WITH pv_id = " + pv_id +
+					"    START WITH pv_id = ?" +
 					"    CONNECT BY nocycle prior last_pv_id = pv_id " +
 					"  ) " +
-					" WHERE DLOCKED = 'Y' and pkg_version not like '(%' AND pv_id != " + pv_id
+					" WHERE DLOCKED = 'Y' and pkg_version not like '(%' AND pv_id != ?"
 	                   //" WHERE build_type != 'Y' and pv_id != " + pv_id
 			        );
+			stmt.setInt(1, pv_id);
+			stmt.setInt(2, pv_id);
+			stmt.setInt(3, pv_id);
 			ResultSet rset = stmt.executeQuery();
 			while( rset.next() )
+			{
 				// Previous Version of this package, without the project suffix
             CallableStatement stmt = mConnection.prepareCall("select bm.bm_name, bsa.bsa_name "
                     + "from release_manager.package_versions pv,"
                     + "     release_manager.package_build_info pbi,"
                     + "     release_manager.build_machines bm,"
                     + "     release_manager.build_standards_addendum bsa "
-                    + "where pv.pv_id=" + p.mId
+                    + "where pv.pv_id=?"
                     + "   and pbi.pv_id=pv.pv_id"
                     + "   and bm.bm_id=pbi.bm_id"
                     + "   and bsa.bsa_id=pbi.bsa_id "
                     + "order by pv.pv_id");
+            stmt.setInt(1, p.mId);
             RmResultSet rset = new RmResultSet (stmt.executeQuery(),"queryBuildInfo");
             while (rset.next())
+            {
                 String bm_name = rset.mustGetKeyString("bm_name");
+            {
                 mLogger.info("queryPackageVersions release_manager.package_versions");
                 CallableStatement stmt1 = mConnection.prepareCall(
                     "select pkg_id" +
                     " from release_manager.package_versions" +
-                    " where pkg_id=" + pkg_id +
+                    " where pkg_id=?" +
-                    " and pkg_version='" + pkg_version + "'");
+                    " and pkg_version=?");
+                stmt1.setInt(1, pkg_id);
+                stmt1.setString(2, pkg_version);
                 ResultSet rset1 = stmt1.executeQuery();
                 int rsetSize = 0;
                 while( rset1.next() )
+                {
+                {
                     mLogger.info("queryPackageVersions release_manager.planned_versions");
                     CallableStatement stmt2 = mConnection.prepareCall(
                         "select pkg_id" +
                         " from release_manager.planned_versions" +
-                        " where pkg_id=" + pkg_id +
+                        " where pkg_id=?" +
-                        " and pkg_version='" + pkg_version + "'");
+                        " and pkg_version=?");
+                    stmt2.setInt(1, pkg_id);
+                    stmt2.setString(2, pkg_version);
                     ResultSet rset2 = stmt2.executeQuery();
                     rsetSize = 0;
                     while( rset2.next() )
+                    {
                     //
                     // Another complication
                     //  If this is a direct exclusion (rootPvid) is null and the entry in the table is an indirect exclusion
                     //  then we should delete the indirect exclusion and replace it with a direct exclusion
                     //
+                    CallableStatement stmt = mConnection.prepareCall(
-                    CallableStatement stmt = mConnection.prepareCall("select pv_id, root_pv_id from release_manager.do_not_ripple where pv_id=" + packageVersionId + "and rtag_id=" + rtagId);
+                            "select pv_id, root_pv_id from release_manager.do_not_ripple where pv_id=? and rtag_id=?");
+                    stmt.setInt(1, packageVersionId);
+                    stmt.setInt(2, rtagId);
                     ResultSet rset = stmt.executeQuery();
                     while( rset.next() )
+                    {
                         exist = true;
+        {
             try
+            {
                 CallableStatement stmt = mConnection.prepareCall(
                     "delete from release_manager.do_not_ripple " +
-                    "  where rtag_id=" + rtagId +
+                    "  where rtag_id=?" +
-                    "  and pv_id=" + packageVersionId +
+                    "  and pv_id=?" +
                     "  and (root_pv_id is not NULL or root_cause is not NULL or root_file is not NULL)"
                     );
+                stmt.setInt(1, rtagId);
+                stmt.setInt(2, packageVersionId);
                 stmt.executeUpdate();
                 stmt.close();
+            }
             catch ( SQLException e )
+            {
         else
+        {
             try
+            {
                 connect();
-                CallableStatement stmt = mConnection.prepareCall("select current_build_files from release_manager.run_level where rcon_id=" + rcon_id);
+                CallableStatement stmt = mConnection.prepareCall("select current_build_files from release_manager.run_level where rcon_id=?");
+                stmt.setInt(1, rcon_id);
                 ResultSet rset = stmt.executeQuery();
                 int rsetSize = 0;
                 while( rset.next() )
+                {
                     "  NVL(rl.pause,0) as pause," +
                     "  rc.daemon_mode," +
                     "  NVL2(rl.CURRENT_BUILD_FILES, 1 , 0) as bfPresent" +
                     " FROM release_manager.release_config rc," +
                     "     release_manager.run_level rl" +
-                    " WHERE rc.rtag_id = " + rtag_id +
+                    " WHERE rc.rtag_id = ?" +
                     " AND   rl.rcon_id = rc.rcon_id" +
                     " AND   rc.bmcon_id is not NULL");
             stmt.setFetchSize(20);
+            stmt.setInt(1, rtag_id);
             RmResultSet rset = new RmResultSet(stmt.executeQuery(),"queryRunLevel 2");
             int rcon_id = 0;
             int current_run_level = 0;
             String modeString;
             char mode;
                     "  NVL(rl.pause,0) as pause," +
                     "  NVL2(rl.CURRENT_BUILD_FILES, 1 , 0) as bfPresent" +
                     " from release_manager.run_level rl,"+
                     "   release_manager.release_config rc" +
                     " where rl.rcon_id = rc.rcon_id" +
-                    "   AND rc.rcon_id=" + rcon_id +
+                    "   AND rc.rcon_id=?" +
                     "   AND rc.bmcon_id is not NULL" +
-                    "   AND rc.daemon_mode='" + daemon_mode + "'" +
+                    "   AND rc.daemon_mode=?" +
-                    "   AND UPPER(rc.daemon_hostname)=UPPER('" + hostname + "')"
+                    "   AND UPPER(rc.daemon_hostname)=UPPER(?)"
                     );
+            stmt.setInt(1, rcon_id);
+            stmt.setString(2, String.valueOf(daemon_mode));
+            stmt.setString(3, hostname);
             RmResultSet rset = new RmResultSet(stmt.executeQuery(),"querySingleRunLevel");
             int rsetSize = 0;
             int current_run_level = 0;
             int pause = 0;
             int buildFilePresent = 0;
         try
+        {
             connect();
             mLogger.warn("updateCurrentRunLevel: Set Runlevel:{}, rconId:{}", runLevel, rcon_id);
+            PreparedStatement stmt = mConnection.prepareCall(
-            PreparedStatement stmt = mConnection.prepareCall("update release_manager.run_level set current_run_level=" + runLevel + ", keep_alive=SYSDATE where rcon_id=" + rcon_id);
+                    "update release_manager.run_level set current_run_level=?, keep_alive=SYSDATE where rcon_id=?");
+            stmt.setInt(1, runLevel);
+            stmt.setInt(2, rcon_id);
             stmt.executeUpdate();
             stmt.close();
             mLogger.info("updateCurrentRunLevel: committing");
             commit();
+            }
+        }
+    }
+    /** Reset the dumpPlan request
+     *  Assume that we have a database connection
+     * @throws Exception
+     */
+    public void resetPlanControl(int mRtagId) throws Exception {
+        mLogger.debug("resetPlanControl {}", mRtagId);
+        if ( mUseDatabase )
+        {
+            try
+            {
+                CallableStatement stmt = mConnection.prepareCall(
+                        "UPDATE release_manager.release_tags SET PLAN_DROP = 'N' WHERE rtag_id  = ?" );
+                stmt.setInt(1, mRtagId);
+                stmt.executeUpdate();
+                stmt.close();
+                commit();
+            }
+            catch ( SQLException e )
+            {
+                handleSQLException(e, "");
+            }
+        }
+        mLogger.info("resetPlanControl {} Done", mRtagId);
+    }
+}

Subversion Repositories DevTools

(root)/buildtool/trunk/src/main/java/com/erggroup/buildtool/ripple/ReleaseManager.java – Rev 7163 → 7169