Changeset 33619 for trunk/ippTools

Timestamp:

Mar 28, 2012, 4:12:23 PM (14 years ago)

Author:

heather

Message:

the query was not optimal. It's still not optimal but at least it's faster

Location:

trunk/ippTools

Files:

• share/addtool_checkminidvodbaddrun.sql (modified) (1 diff)
• src/addtool.c (modified) (3 diffs)

trunk/ippTools/share/addtool_checkminidvodbaddrun.sql

@@ -10 +10 @@
        (SELECT minidvodb_group as minidbg, minidvodb_name as minidbn, count(state) 
         AS cnt 
-        FROM addRun 
+        FROM addRun where minidvodb_group = '%s'
         GROUP BY minidvodb_name ) 
    AS foo1 ON minidvodb_name = minidbn

trunk/ippTools/src/addtool.c

@@ -1380 +1380 @@
   PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidvodbRun.minidvodb_name", "==");
   PXOPT_COPY_STR(config->args, where, "-state", "minidvodbRun.state", "==");
-
-
+  PXOPT_LOOKUP_STR(minidvodb_group,  config->args, "-minidvodb_group", false, false);
+  
   PXOPT_LOOKUP_U64(limit,      config->args, "-limit", false, false);
   PXOPT_LOOKUP_BOOL(all_addrun_states, config->args, "-all_addrun_states", false);
@@ -1393 +1393 @@
   }
 
-  psString query = pxDataGet("addtool_checkminidvodbaddrun.sql");
-
-  if (!query) {
+  if (!minidvodb_group) {
+    psError(PXTOOLS_ERR_CONFIG, false, "minidvodb_group  required");
+    return false;
+  }
+
+
+  psString bare_query = pxDataGet("addtool_checkminidvodbaddrun.sql");
+  
+  if (!bare_query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
         return false;
   }
 
-
+  psString where_string = NULL;
   if (psListLength(where->list)) {
     psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, " WHERE %s", whereClause);
+        psStringAppend(&where_string, " WHERE %s", whereClause);
         psFree(whereClause);
-  }
-
+        //search params are defined above
+  }
+
+  psString query = NULL;
+  psStringAppend(&query, bare_query, minidvodb_group);
+  psStringAppend(&query, where_string);
+
+
+
+
+  
   if (!all_addrun_states) {
     psStringAppend(&query, " AND (cnt2 = cnt) ");
@@ -1419 +1434 @@
 
   if (!p_psDBRunQuery(config->dbh, query)) {
-    psError(PS_ERR_UNKNOWN, false, "database error");
+    psError(PS_ERR_UNKNOWN, false, "database error,\n\n%s", query);
     psFree(query);
     return false;