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

      * The character code is inserted directly into the Release Manager Database
+     *
      */
     public enum BuildReason {
-        Ripple('R'),
+        Ripple('R'),            // Caused by mismatched dependencies
-        Test('T'),
+        Test('T'),              // A test request via a daemon instruction
-        NewVersion('N'),
+        NewVersion('N'),        // A user WIP will create a new version of a package
-        Restore('P');
+        Restore('P'),           // Package not present in dpkg_archive and must be rebuilt
+        Forced('F');            // Forced Ripple Request via a daemon instruction
         private char reason;
         private BuildReason(char reason) { this.reason = reason; }
         @Override
         public  String toString() { return String.valueOf(reason); }
         if ( mUseDatabase )
+        {
             try
+            {
                 connect();
+// TODO What will the 'Forced' ripple do
                 CallableStatement stmt = mConnection.prepareCall("begin ? := PK_RMAPI.new_build_instance(?,?,?); end;");
                 stmt.registerOutParameter( 1, Types.INTEGER);
                 stmt.setLong( 2,rtagId );
                 stmt.setLong( 3,pvId );
                 stmt.setString( 4,reason.toString() );
             while( rset1.next() )
+            {
                 int pvId = rset1.mustGetKeyInt("pv_id");
-                Package p = getPackageInfo(pvId, rippleEngine);
+                Package p = getPackageInfo(pvId, rippleEngine, true);
                 if ( p != NULL_PACKAGE)
+                {
                     p.mIsNotReleased = true;
                     p.mDirectlyPlanned = true;
                     p.mBuildReason = BuildReason.NewVersion;
             DaemonInstruction di = new DaemonInstruction( baseline, 1, true);
             while ( getDaemonInst( di ) )
+            {
                 mLogger.info("queryPackageVersions test build data {}", di.pvId);
-                Package p = getPackageInfo(di.pvId, rippleEngine);
+                Package p = getPackageInfo(di.pvId, rippleEngine, false);
                 if ( p == NULL_PACKAGE )
+                {
                     mLogger.error("queryTest rset15 no data found {}", di.instruction);
                     markDaemonInstCompleted( di.instruction );
             phase.setPhase("getDaemonInstructions1");
             DaemonInstruction di = new DaemonInstruction( baseline, 0, true);
             while ( getDaemonInst( di ) )
+            {
-                Package p = getPackageInfo(di.pvId, rippleEngine);
+                Package p = getPackageInfo(di.pvId, rippleEngine, false);
                 if ( p != NULL_PACKAGE )
+                {
                     mLogger.info("queryPackageVersions forced ripple data {}", di.pvId);
                     packageCollection.add(p);
                     p.mForcedRippleInstruction = di.instruction;
                     p.addEmail(di.userEmail);
-                    p.mBuildReason = BuildReason.Ripple;
+                    p.mBuildReason = BuildReason.Forced;
                     p.mIsNotReleased = true;
+                }
                 else
+                {
                     // discard
      *      mBuildReason
      *      mDirectlyPlanned
+     *
      *  @param  pvId    - Package to process
      * @param rippleEngine - Ripple engine associated wit the Release
+     * @param useChangeType - true: For a WIP, the change type is significant
      * @throws Exception
+     *
      *  @returns a package - May be null, but this is not good
      */
-    Package getPackageInfo(int pvId, RippleEngine rippleEngine) throws Exception
+    Package getPackageInfo(int pvId, RippleEngine rippleEngine, boolean useChangeType) throws Exception
+    {
         Package p = NULL_PACKAGE;
         try
+        {
             int major_limit = rset1.getInt("major_limit", 0);
             int minor_limit = rset1.getInt("minor_limit",0);
             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 ) {
+                p = new Package(pkg_id, pv_id, pkg_name, pkg_version, v_ext, pkg_name + v_ext, vcs_tag, ripple_field.charAt(0), ct);
+            } else {
-            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 = 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;
             stmt1.close();
             // get Package dependency info
             mLogger.debug("getPackageInfo: stmt2");
             PreparedStatement stmt2 = mConnection.prepareStatement(
-                    "select dpv.v_ext, dpv.pv_id" +
+                    "select p.pkg_name, dpv.v_ext, dpv.pv_id" +
                             " from " +
                             "     release_manager.package_versions pv,"+
                             "     release_manager.package_dependencies pd," +
-                            "     release_manager.package_versions dpv"+
+                            "     release_manager.package_versions dpv,"+
+                            "     release_manager.packages p" +
                             " where pv.pv_id=" + pvId +
                             "  and pd.pv_id=pv.pv_id"+
-                            "  and dpv.pv_id=pd.dpv_id"
+                            "  and dpv.pv_id=pd.dpv_id" +
+                            "  and pd.dpkg_id = p.pkg_id"
                     );
             stmt2.setFetchSize(500);
             RmResultSet rset2 = new RmResultSet(stmt2.executeQuery(), "getPackageInfo rset2");
             while ( rset2.next() )
+            {
+                String dpv_name = rset2.mustGetKeyString("pkg_name");
-                String dpv_ext = rset2.mustGetKeyString("v_ext");
+                String dpv_ext = rset2.mustGetString("v_ext");
                 int    dpvId = rset2.mustGetInt("pv_id");
-                p.mDependencyCollection.add(pkg_name + dpv_ext);
+                p.mDependencyCollection.add(dpv_name + dpv_ext);
                 p.mDependencyIDCollection.add(dpvId);
+            }
             rset2.close();
             stmt2.close();

Subversion Repositories DevTools

(root)/buildtool/branches/planMetrics2/src/main/java/com/erggroup/buildtool/ripple/ReleaseManager.java – Rev 7081 → 7093