Changeset 32218

Timestamp:

Aug 29, 2011, 6:13:55 PM (15 years ago)

Author:

watersc1

Message:

Speed improvement for difftool -pendingcleanuprun

Location:

trunk/ippTools

Files:

• share/difftool_pendingcleanuprun.sql (modified) (5 diffs)
• src/difftool.c (modified) (1 diff)

trunk/ippTools/share/difftool_pendingcleanuprun.sql

@@ -2 +2 @@
 -- all of this is just to get the camera used for the diff run
 SELECT DISTINCT * FROM 
-   (SELECT 
+   (SELECT DISTINCT
             diffRun.diff_id,
             rawExp.camera,
@@ -29 +29 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
+        @INNERLIMITS@
      UNION
-     SELECT
+     SELECT DISTINCT
             diffRun.diff_id,
             rawExp.camera,
@@ -57 +58 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
+        @INNERLIMITS@
      UNION
-     SELECT
+     SELECT DISTINCT 
             diffRun.diff_id,
             rawExp.camera,
@@ -85 +87 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
+        @INNERLIMITS@
      UNION
-     SELECT
+     SELECT DISTINCT
             diffRun.diff_id,
             rawExp.camera,
@@ -113 +116 @@
              diffRun.state = 'goto_scrubbed' OR 
              diffRun.state = 'goto_purged')
+        @INNERLIMITS@
         ) as Foo
         WHERE 1

trunk/ippTools/src/difftool.c

@@ -2461 +2461 @@
         psString limitString = psDBGenerateLimitSQL(limit);
         psStringAppend(&query, " %s", limitString);
+        psStringSubstitute(&query,limitString,"@INNERLIMITS@");
         psFree(limitString);
+
+    }
+    else {
+      psStringSubstitute(&query,NULL,"@INNERLIMITS@");
     }
     //    fprintf(stderr,"%s",query);