Changeset 23885 for trunk/ippTools/src/receivetool.c

Timestamp:

Apr 16, 2009, 12:39:27 PM (17 years ago)

Author:

Paul Price

Message:

Modifying distribution client workflow (currently composed of receivetool and associated tables) since Bill points out that a fileset is composed of files, and we don't want to download them all serially.

File:

• trunk/ippTools/src/receivetool.c (modified) (12 diffs)

trunk/ippTools/src/receivetool.c

@@ -33 +33 @@
 static bool definesourceMode(pxConfig *config);
 static bool listMode(pxConfig *config);
-static bool definerunMode(pxConfig *config);
+static bool addfilesetMode(pxConfig *config);
 static bool updatelastMode(pxConfig *config);
-static bool pendingrunMode(pxConfig *config);
+static bool pendingfilesetMode(pxConfig *config);
+static bool addfileMode(pxConfig *config);
+static bool pendingfileMode(pxConfig *config);
 static bool addresultMode(pxConfig *config);
 static bool revertMode(pxConfig *config);
@@ -60 +62 @@
         MODECASE(RECEIVETOOL_MODE_DEFINESOURCE, definesourceMode);
         MODECASE(RECEIVETOOL_MODE_LIST, listMode);
-        MODECASE(RECEIVETOOL_MODE_DEFINERUN, definerunMode);
+        MODECASE(RECEIVETOOL_MODE_ADDFILESET, addfilesetMode);
         MODECASE(RECEIVETOOL_MODE_UPDATELAST, updatelastMode);
-        MODECASE(RECEIVETOOL_MODE_PENDINGRUN, pendingrunMode);
+        MODECASE(RECEIVETOOL_MODE_PENDINGFILESET, pendingfilesetMode);
+        MODECASE(RECEIVETOOL_MODE_ADDFILE, addfileMode);
+        MODECASE(RECEIVETOOL_MODE_PENDINGFILE, pendingfileMode);
         MODECASE(RECEIVETOOL_MODE_ADDRESULT, addresultMode);
         MODECASE(RECEIVETOOL_MODE_REVERT, revertMode);
@@ -100 +104 @@
 
     if (!receiveSourceInsert(config->dbh, 0, source, product, workdir, comment, last)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
+        psError(PS_ERR_UNKNOWN, false, "Database error");
         return false;
     }
@@ -159 +163 @@
 }
 
-static bool definerunMode(pxConfig *config)
+static bool addfilesetMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -167 +171 @@
     PXOPT_LOOKUP_STR(fileset, config->args, "-fileset",  true, false);
 
-    if (!receiveRunInsert(config->dbh, 0, source_id, fileset)) {
-        psError(PS_ERR_UNKNOWN, false, "database error");
+    if (!receiveFilesetInsert(config->dbh, 0, source_id, fileset)) {
+        psError(PS_ERR_UNKNOWN, false, "Database error");
         return false;
     }
@@ -198 +202 @@
 
 
-static bool pendingrunMode(pxConfig *config)
+static bool pendingfilesetMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -207 +211 @@
     PXOPT_COPY_STR(config->args, where, "-source", "receiveSource.source", "==");
     PXOPT_COPY_STR(config->args, where, "-product", "receiveSource.product", "==");
-    PXOPT_COPY_S64(config->args, where, "-comment", "receiveSource.comment", "LIKE");
-
-    psString query = pxDataGet("receivetool_pendingrun.sql");
+    PXOPT_COPY_STR(config->args, where, "-comment", "receiveSource.comment", "LIKE");
+
+    psString query = pxDataGet("receivetool_pendingfileset.sql");
     if (!query) {
         psError(PXTOOLS_ERR_DATA, false, "Failed to retreive SQL statement");
@@ -240 +244 @@
         return true;
     }
-    if (!ippdbPrintMetadatas(stdout, output, "receiveRun", true)) {
+    if (!ippdbPrintMetadatas(stdout, output, "receiveFileset", true)) {
         psError(PS_ERR_UNKNOWN, false, "Failed to print array");
         psFree(output);
@@ -250 +254 @@
 }
 
+static bool addfileMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    // required
+    PXOPT_LOOKUP_S64(fileset_id, config->args, "-fileset_id", true, false);
+    PXOPT_LOOKUP_STR(file, config->args, "-file",  true, false);
+
+    if (!receiveFileInsert(config->dbh, 0, fileset_id, file)) {
+        psError(PS_ERR_UNKNOWN, false, "Database error");
+        return false;
+    }
+
+    return true;
+}
+
+static bool pendingfileMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    psMetadata *where = psMetadataAlloc(); // WHERE conditions
+
+    // required
+    PXOPT_COPY_STR(config->args, where, "-source", "receiveSource.source", "==");
+    PXOPT_COPY_STR(config->args, where, "-product", "receiveSource.product", "==");
+    PXOPT_COPY_STR(config->args, where, "-comment", "receiveSource.comment", "LIKE");
+    PXOPT_COPY_S64(config->args, where, "-fileset_id", "receiveFile.file_id", "==");
+
+    psString query = pxDataGet("receivetool_pendingfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "Failed to retreive SQL statement");
+        psFree(where);
+        return false;
+    }
+
+    if (psListLength(where->list)) {
+        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
+        psStringAppend(&query, " AND %s", whereClause);
+        psFree(whereClause);
+    }
+    psFree(where);
+
+    if (!p_psDBRunQueryF(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "Database error");
+        psFree(query);
+        return false;
+    }
+    psFree(query);
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        psError(PS_ERR_UNKNOWN, false, "Database error");
+        return false;
+    }
+    if (!psArrayLength(output)) {
+        psTrace("receivetool", PS_LOG_INFO, "No rows found");
+        psFree(output);
+        return true;
+    }
+    if (!ippdbPrintMetadatas(stdout, output, "receiveFile", true)) {
+        psError(PS_ERR_UNKNOWN, false, "Failed to print array");
+        psFree(output);
+        return false;
+    }
+    psFree(output);
+
+    return true;
+}
+
 static bool addresultMode(pxConfig *config)
 {
@@ -255 +328 @@
 
     // required
-    PXOPT_LOOKUP_S64(receive_id, config->args, "-source_id", true, false);
+    PXOPT_LOOKUP_S64(fileset_id, config->args, "-source_id", true, false);
 
     // optional
@@ -262 +335 @@
     PXOPT_LOOKUP_S32(fault, config->args, "-fault", false, false);
 
-    if (!receiveResultInsert(config->dbh, receive_id, dtime_copy, dtime_extract, fault)) {
+    if (!receiveResultInsert(config->dbh, fileset_id, dtime_copy, dtime_extract, fault)) {
         psError(PS_ERR_UNKNOWN, false, "Database error");
         return false;
@@ -276 +349 @@
     psMetadata *where = psMetadataAlloc(); // WHERE conditions
 
-    PXOPT_COPY_S64(config->args, where, "-receive_id", "receiveResult.receive_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-fileset_id", "receiveResult.fileset_id", "==");
     PXOPT_COPY_S32(config->args, where, "-fault", "receiveResult.fault", "==");
     PXOPT_COPY_STR(config->args, where, "-source", "receiveSource.source", "==");