Changeset 40196

Timestamp:

Oct 27, 2017, 7:41:48 PM (9 years ago)

Author:

mhuber

Message:

merge Add option of using old (r35192) or current (r37974) warp-stack diff SQL -- old must be default since nightly processing depends on it

Location:

tags/ipp-20170121/ippTools

Files:

• share/difftool_definewarpstack_old.sql (copied) (copied from trunk/ippTools/share/difftool_definewarpstack_old.sql )
• src/difftool.c (modified) (4 diffs, 1 prop)
• src/difftoolConfig.c (modified) (1 diff, 1 prop)

tags/ipp-20170121/ippTools/src/difftool.c

@@ -1234 +1234 @@
   psMetadata *where = psMetadataAlloc();
 
+  PXOPT_LOOKUP_BOOL(lapQuery, config->args, "-lap_query", false);
+  
   PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
   PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "==");
@@ -1245 +1247 @@
   PXOPT_COPY_STR(config->args, where, "-stack_label", "stackRun.label", "==");
   PXOPT_COPY_STR(config->args, where, "-stack_data_group", "stackRun.data_group", "==");
+
 
   // Add position dependence here.
@@ -1277 +1280 @@
   
   // Get query file
-  psString query = pxDataGet("difftool_definewarpstack.sql");
+  psString query;
+  if (lapQuery) { 
+    query = pxDataGet("difftool_definewarpstack.sql");
+  }
+  else {
+    query = pxDataGet("difftool_definewarpstack_old.sql");
+  }
+  
   if (!query) {
     psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
@@ -1284 +1294 @@
 
   psString whereClause = psDBGenerateWhereConditionSQL(where,NULL);
-  psString diffWhereClause = psStringCopy("");
-  psString joinWhereClause = psStringCopy("");
-  
-  // Don't queue things that already have diffs.
-  if (! (reRun || newTemplates) ) {
-    psStringAppend(&joinWhereClause, "\nAND diff_id IS NULL\n");
+  psString whereClauseString = psStringCopy("");
+  if (lapQuery) {
+    psString diffWhereClause = psStringCopy("");
+    psString joinWhereClause = psStringCopy("");
+    
+    // Don't queue things that already have diffs.
+    if (! (reRun || newTemplates) ) {
+      psStringAppend(&joinWhereClause, "\nAND diff_id IS NULL\n");
+    }
+    // Append diff qualifiers, if we have them
+    if (label) {
+      psStringAppend(&diffWhereClause, "\nAND ((diffRun.label = '%s') OR (diffRun.label IS NULL))",label);
+    }
+    if (data_group) {
+      psStringAppend(&diffWhereClause, "\nAND ((diffRun.data_group = '%s') OR (diffRun.data_group IS NULL))",data_group);
+    }
+    if (reduction) {
+      psStringAppend(&diffWhereClause, "\nAND ((diffRun.reduction = '%s') OR (diffRun.reduction IS NULL))",reduction);
+    }
+
+    psStringAppend(&whereClauseString, " \n AND %s ", whereClause);
+    //  fprintf(stderr,query,whereClauseString);
+
+    // This is just a simple query, so we don't need to do a transaction
+    if (!p_psDBRunQueryF(config->dbh, query, whereClauseString, diffWhereClause,joinWhereClause)) {
+      psError(PS_ERR_UNKNOWN, false, "database error");
+      psFree(query);
+      psFree(whereClause);
+      return(false);
+    }
+    
+    psFree(diffWhereClause);
+    psFree(joinWhereClause);
+    
   }
-  // Append diff qualifiers, if we have them
-  if (label) {
-    psStringAppend(&diffWhereClause, "\nAND ((diffRun.label = '%s') OR (diffRun.label IS NULL))",label);
+  else {
+    // Don't queue things that already have diffs.
+    if (! (reRun || newTemplates) ) {
+      psStringAppend(&whereClause, "\nAND diff_id IS NULL\n");
+    }
+    // Append diff qualifiers, if we have them
+    if (label) {
+      psStringAppend(&whereClause, "\nAND ((diffRun.label = '%s') OR (diffRun.label IS NULL))",label);
+    }
+    if (data_group) {
+      psStringAppend(&whereClause, "\nAND ((diffRun.data_group = '%s') OR (diffRun.data_group IS NULL))",data_group);
+    }
+    if (reduction) {
+      psStringAppend(&whereClause, "\nAND ((diffRun.reduction = '%s') OR (diffRun.reduction IS NULL))",reduction);
+    }
+
+    psStringAppend(&whereClauseString, " \n AND %s ", whereClause);
+    if (!p_psDBRunQueryF(config->dbh, query, whereClauseString)) {
+      psError(PS_ERR_UNKNOWN, false, "database error");
+      psFree(query);
+      psFree(whereClause);
+      return(false);
+    }
+
   }
-  if (data_group) {
-    psStringAppend(&diffWhereClause, "\nAND ((diffRun.data_group = '%s') OR (diffRun.data_group IS NULL))",data_group);
-  }
-  if (reduction) {
-    psStringAppend(&diffWhereClause, "\nAND ((diffRun.reduction = '%s') OR (diffRun.reduction IS NULL))",reduction);
-  }
-
-  psString whereClauseString = psStringCopy("");
-  psStringAppend(&whereClauseString, " \n AND %s ", whereClause);
-  //  fprintf(stderr,query,whereClauseString);
-
-  // This is just a simple query, so we don't need to do a transaction
-  if (!p_psDBRunQueryF(config->dbh, query, whereClauseString, diffWhereClause,joinWhereClause)) {
-    psError(PS_ERR_UNKNOWN, false, "database error");
-    psFree(query);
-    psFree(whereClause);
-    return(false);
-  }
+    
   psFree(query);
   psFree(whereClause);

tags/ipp-20170121/ippTools/src/difftoolConfig.c

@@ -271 +271 @@
     psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
     psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-pretend", 0, "list results but to not queue", false);
-
+    psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-lap_query", 0, "Use the updated LAP style SQL code", false);
+    
     pxspaceBoxAddArguments(definewarpstackArgs);