Changeset 42097 for trunk/ippTools

Timestamp:

Feb 28, 2022, 4:29:58 PM (4 years ago)

Author:

eugene

Message:

fix definition of a field in pxadmin_create_tables; add option to queue stacks with invalid input warps; add option to restrict stack query by spatial region

Location:

trunk/ippTools

Files:

• . (modified) (1 prop)
• share (modified) (1 prop)
• share/Makefile.am (modified) (1 diff)
• share/pxadmin_create_tables.sql (modified) (1 diff)
• share/stacktool_tosum_allstates.sql (copied) (copied from branches/eam_branches/ipp-20211108/ippTools/share/stacktool_tosum_allstates.sql )
• src (modified) (1 prop)
• src/stacktool.c (modified) (2 diffs)
• src/stacktoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/Makefile.am

@@ -421 +421 @@
         stacktool_sassskyfile.sql \
         stacktool_tosum.sql \
+        stacktool_tosum_allstates.sql \
         stacktool_tobkg.sql \
         stacktool_tosummary.sql \

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1453 +1453 @@
         username VARCHAR(255),
         proj_id BIGINT,
-        registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+        registered datetime,
         timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
         fault SMALLINT,

trunk/ippTools/src/stacktool.c

@@ -264 +264 @@
     pxAddLabelSearchArgs (config, where, "-warp_id",                   "warpRun.warp_id", "==");
     
+    // Add position dependence here.
+    if (!pxspaceBoxAddWhere(config, where)) {
+      psError(psErrorCodeLast(), false, "pxSpaceBoxAddWhere failed");
+      return false;
+    }
+  
     // these are used to build the HAVING restriction
     PXOPT_COPY_S32(config->args, having, "-min_num", "num_warp", ">=");
@@ -922 +928 @@
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
-
-    psString query = pxDataGet("stacktool_tosum.sql");
+    PXOPT_LOOKUP_BOOL(ignore_warp_state, config->args, "-ignore-warp-state", false);
+
+    psString query = ignore_warp_state ? pxDataGet("stacktool_tosum_allstates.sql") : pxDataGet("stacktool_tosum.sql");
     if (!query) {
         psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");

trunk/ippTools/src/stacktoolConfig.c

@@ -103 +103 @@
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",  0, "do not actually modify the database", false);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
+    pxspaceBoxAddArguments(definebyqueryArgs);
 
     // -definerun
@@ -153 +154 @@
     psMetadataAddU64(tosumArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     psMetadataAddBool(tosumArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
+    psMetadataAddBool(tosumArgs, PS_LIST_TAIL, "-ignore-warp-state",  0, "generate the stack even if some inputs are not full", false);
 
     // -tobkg