HPCC-35470 Add --delete-prev option to ecl queries copy-set command

Author: Copilot

ecl/eclcmd/queries/ecl-queries.cpp

@@ -739,6 +739,10 @@ class EclCmdQueriesCopyQueryset : public EclCmdCommon
                 continue;
             if (iter.matchFlag(optCloneActiveState, ECLOPT_CLONE_ACTIVE_STATE))
                 continue;
+            if (iter.matchFlag(optSuspendPrevious, ECLOPT_SUSPEND_PREVIOUS)||iter.matchFlag(optSuspendPrevious, ECLOPT_SUSPEND_PREVIOUS_S))
+                continue;
+            if (iter.matchFlag(optDeletePrevious, ECLOPT_DELETE_PREVIOUS)||iter.matchFlag(optDeletePrevious, ECLOPT_DELETE_PREVIOUS_S))
+                continue;
             if (iter.matchFlag(optDontCopyFiles, ECLOPT_DONT_COPY_FILES))
                 continue;
             if (iter.matchFlag(optAllQueries, ECLOPT_ALL))
@@ -772,6 +776,16 @@ class EclCmdQueriesCopyQueryset : public EclCmdCommon
             fputs("source and destination querysets must both be specified.\n", stderr);
             return false;
         }
+        if (!optCloneActiveState && (optSuspendPrevious || optDeletePrevious))
+        {
+            fputs("Error: --suspend-prev and --delete-prev require --clone-active-state.\n", stderr);
+            return false;
+        }
+        if (optSuspendPrevious && optDeletePrevious)
+        {
+            fputs("Error: --suspend-prev and --delete-prev are mutually exclusive options.\n", stderr);
+            return false;
+        }
         return true;
     }
 
@@ -796,6 +810,14 @@ class EclCmdQueriesCopyQueryset : public EclCmdCommon
         req->setDfsServer(optDaliIP.get());
         req->setSourceProcess(optSourceProcess);
         req->setCloneActiveState(optCloneActiveState);
+        if (optDeletePrevious)
+            req->setActivate(CWUQueryActivationMode_ActivateDeletePrevious);
+        else if (optSuspendPrevious)
+            req->setActivate(CWUQueryActivationMode_ActivateSuspendPrevious);
+        else if (optCloneActiveState)
+            req->setActivate(CWUQueryActivationMode_ActivateSuspendPrevious);
+        else
+            req->setActivate(CWUQueryActivationMode_NoActivate);
         req->setOverwriteDfs(optOverwrite);
         req->setUpdateSuperFiles(optUpdateSuperfiles);
         req->setUpdateCloneFrom(optUpdateCloneFrom);
@@ -862,6 +884,8 @@ class EclCmdQueriesCopyQueryset : public EclCmdCommon
             "   --daliip=<ip>          Remote Dali DFS to use for copying file information\n"
             "   --source-process       Process cluster to copy files from\n"
             "   --clone-active-state   Make copied queries active if active on source\n"
+            "   -sp, --suspend-prev    Suspend previously active query\n"
+            "   -dp, --delete-prev     Delete previously active query\n"
             "   -O, --overwrite        Completely replace existing DFS file information (dangerous)\n"
             "   --update-super-files   Update local DFS super-files if remote DALI has changed\n"
             "   --update-clone-from    Update local clone from location if remote DALI has changed\n"
@@ -887,6 +911,8 @@ class EclCmdQueriesCopyQueryset : public EclCmdCommon
     bool optDontCopyFiles;
     bool optAllowForeign;
     bool optAllQueries;
+    bool optSuspendPrevious = false;
+    bool optDeletePrevious = false;
     bool optSourceSSL = false; //user explicitly turning on SSL for accessing the remote source location (ssl defaults to use SSL if we are hitting ESP via SSL)
     bool optSourceNoSSL = false; //user explicitly turning OFF SSL for accessing the remote source location (ssl defaults to not use SSL if we are not hitting ESP via SSL)
 };

esp/scm/ws_workunits.ecm

@@ -25,7 +25,7 @@ EspInclude(ws_workunits_queryset_req_resp);
 
 ESPservice [
     auth_feature("DEFERRED"), //This declares that the method logic handles feature level authorization
-    version("2.03"), default_client_version("2.03"), cache_group("ESPWsWUs"),
+    version("2.04"), default_client_version("2.04"), cache_group("ESPWsWUs"),
     noforms,exceptions_inline("./smc_xslt/exceptions.xslt"),use_method_name] WsWorkunits
 {
     ESPmethod [cache_seconds(60), resp_xsl_default("/esp/xslt/workunits.xslt")]     WUQuery(WUQueryRequest, WUQueryResponse);

esp/scm/ws_workunits_queryset_req_resp.ecm

@@ -523,6 +523,7 @@ ESPrequest [nil_remove] WUCopyQuerySetRequest
     [min_ver("1.95")] string DfuPublisherWuid; //Wuid can be preallocated and then passed in here to use.  Will be created if empty
     [min_ver("1.97")] string RemoteStorage;
     [min_ver("2.02")] string KeyCompression;
+    [min_ver("2.04")] ESPEnum WUQueryActivationMode Activate;
 };
 
 ESPresponse [exceptions_inline] WUCopyQuerySetResponse

esp/services/ws_workunits/ws_workunitsQuerySets.cpp

@@ -3056,12 +3056,18 @@ class QueryCloner
         queryDirectory.set(dir);
     }
 
+    void setActivationMode(int mode)
+    {
+        activationMode = mode;
+    }
+
     void addToBePublished(const char *wuid, const char *name, bool makeActive, const char *userid, IPropertyTree *query)
     {
         IPropertyTree *entry = toBePublished->addPropTree("Publish");
         entry->setProp("@wuid", wuid);
         entry->setProp("@name", name);
         entry->setPropBool("@makeActive", makeActive);
+        entry->setPropInt("@activationMode", makeActive ? activationMode : DO_NOT_ACTIVATE);
         entry->setProp("@userid", userid);
         entry->addPropTree("Info", createPTreeFromIPT(query));
 
@@ -3082,7 +3088,12 @@ class QueryCloner
             IPropertyTree &entry = entries->query();
             StringBuffer newQueryId;
             Owned<IWorkUnit> workunit = factory->updateWorkUnit(entry.queryProp("@wuid"));
-            addQueryToQuerySet(workunit, destQuerySet, entry.queryProp("@name"), entry.getPropBool("@makeActive") ? ACTIVATE_SUSPEND_PREVIOUS : DO_NOT_ACTIVATE, newQueryId, entry.queryProp("@userid"));
+            int queryActivationMode = DO_NOT_ACTIVATE;
+            if (entry.hasProp("@activationMode"))
+                queryActivationMode = entry.getPropInt("@activationMode");
+            else if (entry.getPropBool("@makeActive"))
+                queryActivationMode = ACTIVATE_SUSPEND_PREVIOUS;
+            addQueryToQuerySet(workunit, destQuerySet, entry.queryProp("@name"), queryActivationMode, newQueryId, entry.queryProp("@userid"));
             copiedQueryIds.append(newQueryId);
             IPropertyTree *info = entry.queryPropTree("Info");
             if (info)
@@ -3131,7 +3142,7 @@ class QueryCloner
         {
             existingQueryIds.append(existingQueryId.str());
             if (makeActive)
-                activateQuery(destQuerySet, ACTIVATE_SUSPEND_PREVIOUS, queryName, existingQueryId.str(), context->queryUserId());
+                activateQuery(destQuerySet, activationMode, queryName, existingQueryId.str(), context->queryUserId());
             return;
         }
         addToBePublished(wuid, queryName, makeActive, context->queryUserId(), query);
@@ -3158,7 +3169,7 @@ class QueryCloner
         {
             existingQueryIds.append(existingQueryId.str());
             if (makeActive)
-                activateQuery(destQuerySet, ACTIVATE_SUSPEND_PREVIOUS, queryName, existingQueryId.str(), context->queryUserId());
+                activateQuery(destQuerySet, activationMode, queryName, existingQueryId.str(), context->queryUserId());
             return;
         }
         StringBuffer newQueryId;
@@ -3321,6 +3332,7 @@ class QueryCloner
     bool cloneFilesEnabled = false;
     bool useSSL = false;
     unsigned updateFlags = 0;
+    int activationMode = ACTIVATE_SUSPEND_PREVIOUS;
     StringArray locations;
 
 public:
@@ -3353,6 +3365,20 @@ bool CWsWorkunitsEx::onWUCopyQuerySet(IEspContext &context, IEspWUCopyQuerySetRe
     QueryCloner cloner(&context, srcAddress, srcTarget, target, req.getSourceSSL());
     cloner.setQueryDirectory(queryDirectory);
 
+    int queryActivationMode = ACTIVATE_SUSPEND_PREVIOUS;
+    if (req.getActivate_isNull())
+    {
+        // For backward compatibility: if Activate is not set, use CloneActiveState behavior
+        // CloneActiveState true means activate with suspend-previous (default behavior)
+        queryActivationMode = req.getCloneActiveState() ? ACTIVATE_SUSPEND_PREVIOUS : DO_NOT_ACTIVATE;
+    }
+    else
+    {
+        // Use the new Activate enum if provided
+        queryActivationMode = req.getActivate();
+    }
+    cloner.setActivationMode(queryActivationMode);
+
     SCMStringBuffer process;
     StringBuffer publisherWuid(req.getDfuPublisherWuid());
     if (req.getCopyFiles())