Changeset 23842

Timestamp:

Apr 13, 2009, 4:32:41 PM (17 years ago)

Author:

bills

Message:

modes to disttool for creating rcDSFileset objects
tweaks to the rcDSFileset and rcDSProduct tables

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (1 diff)
• share/disttool_pendingfileset.sql (added)
• share/disttool_processedcomponent.sql (modified) (1 diff)
• share/pxadmin_create_tables.sql (modified) (2 diffs)
• src/disttool.c (modified) (3 diffs)
• src/disttool.h (modified) (1 diff)
• src/disttoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/Makefile.am

@@ -100 +100 @@
      disttool_definebyquery_warp.sql \
      disttool_pendingcomponent.sql \
+     disttool_pendingfileset.sql \
      disttool_processedcomponent.sql \
      disttool_revertrun_update.sql \

trunk/ippTools/share/disttool_processedcomponent.sql

@@ -1 @@
-SELECT *
-FROM    distComponent
+SELECT 
+    dist_id,
+    target_id,
+    stage,
+    stage_id,
+    component,
+    CONCAT_WS('.', outroot, CONVERT(dist_id, CHAR)) as outdir,
+    bytes,
+    md5sum,
+    name,
+    distComponent.state,
+    distComponent.fault
+FROM    distRun
+JOIN distComponent USING(dist_id)

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1250 +1250 @@
     dbname      VARCHAR(64),
     dbhost      VARCHAR(64),
-    prod_root   VARCHAR(255),
     PRIMARY KEY(prod_id)
 )  ENGINE=innodb DEFAULT CHARSET=latin1;
@@ -1281 +1280 @@
     dist_id     BIGINT,
     prod_id     BIGINT,
-    name        VARCHAR(64),
+    name        VARCHAR(255),
     state       VARCHAR(64),
     registered  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY(fs_id),
+    fault       SMALLINT DEFAULT 0,
+    PRIMARY KEY(dist_id, prod_id),
+    KEY(fs_id),
     FOREIGN KEY(dist_id) REFERENCES distRun(dist_id),
     FOREIGN KEY(prod_id) REFERENCES rcDSProduct(prod_id)
+--    KEY(dist_id, prod_id)
 )  ENGINE=innodb DEFAULT CHARSET=latin1;
 

trunk/ippTools/src/disttool.c

@@ -39 +39 @@
 static bool processedcomponentMode(pxConfig *config);
 static bool toadvanceMode(pxConfig *config);
+static bool pendingfilesetMode(pxConfig *config);
+static bool addfilesetMode(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -67 +69 @@
         MODECASE(DISTTOOL_MODE_PROCESSEDCOMPONENT, processedcomponentMode);
         MODECASE(DISTTOOL_MODE_TOADVANCE, toadvanceMode);
+        MODECASE(DISTTOOL_MODE_PENDINGFILESET, pendingfilesetMode);
+        MODECASE(DISTTOOL_MODE_ADDFILESET, addfilesetMode);
         default:
             psAbort("invalid option (this should not happen)");
@@ -790 +794 @@
     return true;
 }
+
+static bool pendingfilesetMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psMetadata *where = psMetadataAlloc();
+    PXOPT_COPY_S64(config->args, where, "-dist_id", "dist_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+
+    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+
+    // look for "inputs" that need to processed
+    psString query = pxDataGet("disttool_pendingfileset.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
+
+    if (psListLength(where->list)) {
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
+    }
+    psFree(where);
+
+    // treat limit == 0 as "no limit"
+    if (limit) {
+        psString limitString = psDBGenerateLimitSQL(limit);
+        psStringAppend(&query, " %s", limitString);
+        psFree(limitString);
+    }
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        psErrorCode err = psErrorCodeLast();
+        switch (err) {
+            case PS_ERR_DB_CLIENT:
+                psError(PXTOOLS_ERR_SYS, false, "database error");
+            case PS_ERR_DB_SERVER:
+                psError(PXTOOLS_ERR_PROG, false, "database error");
+            default:
+                psError(PXTOOLS_ERR_PROG, false, "unknown error");
+        }
+
+        return false;
+    }
+    if (!psArrayLength(output)) {
+        psTrace("disttool", PS_LOG_INFO, "no rows found");
+        psFree(output);
+        return true;
+    }
+
+    if (psArrayLength(output)) {
+        // negative simple so the default is true
+        if (!ippdbPrintMetadatas(stdout, output, "pendingfileset", !simple)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to print array");
+            psFree(output);
+            return false;
+        }
+    }
+
+    psFree(output);
+
+    return true;
+}
+static bool addfilesetMode(pxConfig *config)
+{
+
+    // required values
+    PXOPT_LOOKUP_S64(dist_id, config->args, "-dist_id", true, false);
+    PXOPT_LOOKUP_S64(prod_id, config->args, "-prod_id", true, false);
+
+    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
+
+    // unless fault code is set require name
+    PXOPT_LOOKUP_STR(name, config->args, "-name", fault == 0, false);
+
+    if (!rcDSFilesetInsert(config->dbh, 
+            0,          // fs_id
+            dist_id,
+            prod_id,
+            name,
+            "full",
+            fault)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        return false;
+    }
+
+    return true;
+}
+

trunk/ippTools/src/disttool.h

@@ -33 +33 @@
     DISTTOOL_MODE_PROCESSEDCOMPONENT,
     DISTTOOL_MODE_TOADVANCE,
+    DISTTOOL_MODE_PENDINGFILESET,
+    DISTTOOL_MODE_ADDFILESET,
 } disttoolMode;
 

trunk/ippTools/src/disttoolConfig.c

@@ -124 +124 @@
     psMetadataAddBool(toadvanceArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
 
+    // -pendingfileset
+    psMetadata *pendingfilesetArgs = psMetadataAlloc();
+    psMetadataAddS64(pendingfilesetArgs, PS_LIST_TAIL, "-dist_id", 0, "define dist_id", 0);
+    psMetadataAddStr(pendingfilesetArgs, PS_LIST_TAIL, "-label",    0, "limit results to label", NULL);
+    psMetadataAddStr(pendingfilesetArgs, PS_LIST_TAIL, "-stage",    0, "limit results to runs for stage", NULL);
+    psMetadataAddU64(pendingfilesetArgs, PS_LIST_TAIL, "-limit",  0,  "limit result set to N items", 0);
+    psMetadataAddBool(pendingfilesetArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
+
+    // -addfileset
+    psMetadata *addfilesetArgs = psMetadataAlloc();
+    psMetadataAddS64(addfilesetArgs, PS_LIST_TAIL, "-dist_id", 0, "define dist_id", 0);
+    psMetadataAddS64(addfilesetArgs, PS_LIST_TAIL, "-prod_id", 0, "define prod_id", 0);
+    psMetadataAddStr(addfilesetArgs, PS_LIST_TAIL, "-name", 0, "define file name", NULL);
+    psMetadataAddS32(addfilesetArgs, PS_LIST_TAIL, "-fault", 0, "define fault code", 0);
     psMetadata *argSets = psMetadataAlloc();
     psMetadata *modes = psMetadataAlloc();
@@ -135 +149 @@
     PXOPT_ADD_MODE("-processedcomponent",      "", DISTTOOL_MODE_PROCESSEDCOMPONENT, processedcomponentArgs);
     PXOPT_ADD_MODE("-toadvance",      "", DISTTOOL_MODE_TOADVANCE, toadvanceArgs);
+    PXOPT_ADD_MODE("-pendingfileset",      "", DISTTOOL_MODE_PENDINGFILESET, pendingfilesetArgs);
+    PXOPT_ADD_MODE("-addfileset",      "", DISTTOOL_MODE_ADDFILESET, addfilesetArgs);
 
     if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {