Changeset 27315 for trunk/ippTools

Timestamp:

Mar 17, 2010, 4:15:53 PM (16 years ago)

Author:

watersc1

Message:

Updated "split" version of lossy compression, with tasks to do compression and cleaning in parallel. This should help us recover disk space quicker.

Location:

trunk/ippTools

Files:

• share/regtool_pendingcompressimfile.sql (modified) (1 diff)
• src/regtool.c (modified) (1 diff)
• src/regtoolConfig.c (modified) (1 diff)

trunk/ippTools/share/regtool_pendingcompressimfile.sql

@@ -1 +1 @@
 SELECT rawImfile.*,rawExp.workdir,rawExp.exp_tag from rawImfile
        JOIN rawExp USING(exp_id)
-       WHERE ((data_state = 'goto_compressed' AND state = 'goto_compressed')
-           OR (data_state = 'goto_lossy' AND state = 'goto_lossy'))
+       WHERE  1
+-- ((data_state = 'goto_compressed' AND state = 'goto_compressed')
+--                 OR (data_state = 'goto_lossy' AND state = 'goto_lossy'))
 -- where hook %s
 -- limit hook %s       

trunk/ippTools/src/regtool.c

@@ -584 +584 @@
     psStringPrepend(&whereClause, "\n AND ");
   }
+  PXOPT_LOOKUP_BOOL(compress, config->args, "-compress", false);
+  PXOPT_LOOKUP_BOOL(clean,    config->args, "-clean", false);
+
+  if ((compress && clean)||(!compress & !clean)) {
+    psStringAppend(&whereClause, "\n AND ((data_state = 'goto_compressed' AND state = 'goto_compressed')\n  OR (data_state = 'goto_lossy' AND state = 'goto_lossy')) ");
+  }
+  else if (compress) {
+    psStringAppend(&whereClause, "\n AND ((data_state = 'goto_compressed' AND state = 'goto_compressed')) ");
+  }
+  else if (clean) {
+    psStringAppend(&whereClause, "\n AND ((data_state = 'goto_lossy' AND state = 'goto_lossy')) ");
+  }
+  else {
+    psStringAppend(&whereClause, "\n AND ((data_state = 'goto_compressed' AND state = 'goto_compressed')\n  OR (data_state = 'goto_lossy' AND state = 'goto_lossy')) ");
+  }    
   
   PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
-
+  
   psString query = pxDataGet("regtool_pendingcompressimfile.sql");
   if (!query) {
     psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
     return(false);
-  }
+  }  
   psString limitString = NULL;
   if (limit) {

trunk/ippTools/src/regtoolConfig.c

@@ -381 +381 @@
     psMetadataAddBool(pendingcompressimfileArgs, PS_LIST_TAIL, "-simple", 0,     "use the simple output format", false);
     psMetadataAddU64(pendingcompressimfileArgs, PS_LIST_TAIL, "-limit",   0,     "limit result set to N items", 0);
-
+    psMetadataAddBool(pendingcompressimfileArgs, PS_LIST_TAIL, "-compress", 0,   "search only for files to compress", 0);
+    psMetadataAddBool(pendingcompressimfileArgs, PS_LIST_TAIL, "-clean",  0,     "search only for files to clean originals", 0);
     
     // -finishcompressexp