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

+{
     /**Unit test hook.
      * Prevents Oracle interaction when false.
      * @attribute
      */
-    public static boolean mUseDatabase = true;
+    public boolean mUseDatabase = true;
     /**Debug Support.
      * Set to false if EnvVar GBE_BUILDTOOL_DEBUG exists
      * Value of GBE_BUILDTOOL_DEBUG is expected to be an email if greater than
      * one character.
                 PreparedStatement stmt1 = mConnection.prepareStatement(
                         "select pl.pv_id, p.pkg_id, p.pkg_name, pv.pkg_version, " +
                                 " pv.v_ext, pv.change_type, pv.ripple_field," +
                                 " pv.major_limit, pv.minor_limit, pv.patch_limit, pv.build_number_limit," +
                                 " pv.modified_stamp," +
-                                " release_manager.PK_RMAPI.return_vcs_tag(pl.pv_id) AS vcsTag" +
+                                " release_manager.PK_RMAPI.return_vcs_tag(pl.pv_id) AS vcsTag," +
+                                " pv.build_time" +
                                 " from release_manager.planned pl," +
                                 "      release_manager.package_versions pv," +
                                 "      release_manager.packages p" +
                                 " where pl.rtag_id=" + baseline +
                                 "   and pv.build_type='A' and pv.dlocked='A'" +
+                {
                     int pv_id = rset1.mustGetKeyInt("pv_id");
                     int pkg_id = rset1.mustGetInt("pkg_id");
                     String pkg_name = rset1.mustGetString("pkg_name");
                     String pkg_version = rset1.mustGetString("pkg_version");
+                    int buildTime = rset1.getInt("build_time", 60);
                     // Previous Version of this package, without the project suffix
                     String pkg_prevVersion = getBaseVersionNumber(pv_id);
                     if ( pkg_prevVersion == null)
+                    {
                         p.mMajorLimit = major_limit;
                         p.mMinorLimit = minor_limit;
                         p.mPatchLimit = patch_limit;
                         p.mBuildLimit = build_number_limit;
                         p.mPrevVersion = pkg_prevVersion;
+                        p.mBuildTime = buildTime;
                         Package prevPlannedPackage = findPackage(p.mAlias, packageCollection);
                         // If there are multiple packages with the same Alias, then only the first one
                         // will be placed in the build set. The will be the oldest, the first one released
                 //
                 mLogger.debug("queryPackageVersions: stmt8");
                 phase.setPhase("getAllPkgs1");
                 PreparedStatement stmt8 = mConnection.prepareStatement(
                         "SELECT rc.pv_id," +
-                                "  p.pkg_id," +
+                                " p.pkg_id," +
-                                "  p.pkg_name," +
+                                " p.pkg_name," +
-                                "  pv.pkg_version," +
+                                " pv.pkg_version," +
-                                "  pv.v_ext," +
+                                " pv.v_ext," +
-                                "  pv.ripple_field," +
+                                " pv.ripple_field," +
-                                "  pv.major_limit," +
+                                " pv.major_limit," +
-                                "  pv.minor_limit," +
+                                " pv.minor_limit," +
-                                "  pv.patch_limit," +
+                                " pv.patch_limit," +
-                                "  pv.build_number_limit," +
+                                " pv.build_number_limit," +
-                                "  pv.build_type," +
+                                " pv.build_type," +
-                                "  rc.sdktag_id," +
+                                " rc.sdktag_id," +
-                                "  rc.ripple_stop," +
+                                " rc.ripple_stop," +
-                                "  peg.pv_id as pegged," +
+                                " peg.pv_id as pegged," +
-                                "  release_manager.PK_RMAPI.return_vcs_tag(rc.pv_id) AS vcsTag" +
+                                " release_manager.PK_RMAPI.return_vcs_tag(rc.pv_id) AS vcsTag," +
+                                " pv.build_time" +
                                 " FROM release_manager.release_content rc," +
                                 "  release_manager.package_versions pv," +
                                 "  release_manager.packages p," +
                                 "  release_manager.pegged_versions peg" +
                                 " WHERE rc.rtag_id= " + baseline +
                     String vcs_tag = rset8.getString("vcsTag","");
                     int isAnSdk = rset8.getInt("sdktag_id",0);
                     int isPegged = rset8.getInt("pegged",0);
                     String buildType = rset8.getString("build_type", null);
                     boolean isBuildable = ( buildType != null ) && (buildType.equals("A") || buildType.equals("Y") );
+                    int buildTime = rset8.getInt("build_time", 60);
                     String rippleStopData = rset8.getString("ripple_stop","n");
                     char rippleStop = rippleStopData.charAt(0);
                     Package p = new Package(pkg_id, pv_id, pkg_name, pkg_version, v_ext, pkg_name + v_ext, vcs_tag, ripple_field.charAt(0));
                     p.mBuildLimit = build_number_limit;
                     p.mIsSdk = isAnSdk > 0;
                     p.mIsPegged = isPegged > 0;
                     p.mIsBuildable = isBuildable;
                     p.mRippleStop = rippleStop;
+                    p.mBuildTime = buildTime;
                     Integer ipv_id = Integer.valueOf(pv_id);
                     rippleEngine.mReleasedPvIDCollection.add(ipv_id);
                     //  If this package is to be replaced by a planned package then
                     String pkg_name = "";
                     String pkg_ext = "";
                     String testBuildVcsTag = "null";
                     int pkg_id = 0;
+                    int buildTime = 60;
                     // get package info for test build package
                     mLogger.debug("queryPackageVersions: stmt15");
                     PreparedStatement stmt15 = mConnection.prepareStatement(
+                            "select p.pkg_name,"+
+                            " p.pkg_id,"+
+                            " pv.v_ext,"+
-                            "select p.pkg_name, p.pkg_id, pv.v_ext, release_manager.PK_RMAPI.return_vcs_tag(pv.pv_id) AS vcsTag " +
+                            " release_manager.PK_RMAPI.return_vcs_tag(pv.pv_id) AS vcsTag," +
+                            " pv.build_time" +
-                                    " from release_manager.package_versions pv," +
+                            " from release_manager.package_versions pv," +
-                                    "release_manager.packages p" +
+                            "      release_manager.packages p" +
-                                    " where pv.pv_id=" + testBuildPvId +
+                            " where pv.pv_id=" + testBuildPvId +
-                                    " and p.pkg_id=pv.pkg_id "
+                            " and p.pkg_id=pv.pkg_id "
                             );
                     stmt15.setFetchSize(10);
                     RmResultSet rset15 = new RmResultSet(stmt15.executeQuery(), "queryPackageVersions rset15");
                     int rsetSize = 0;
                         rsetSize++;
                         pkg_name = rset15.mustGetKeyString("pkg_name");
                         pkg_id = rset15.mustGetInt("pkg_id");
                         pkg_ext = rset15.getString("v_ext","");
                         testBuildVcsTag = rset15.getString("vcsTag", "null");
+                        buildTime = rset15.getInt("build_time", 60);
+// TODO - Store the buildTime somewhere
+                    }
                     rset15.close();
                     stmt15.close();

Subversion Repositories DevTools

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