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

Signed-off-by: M Kelly <[email protected]>

Author: mckellyln

ecl/eclcmd/queries/ecl-queries.cpp

@@ -739,8 +739,6 @@ 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))
@@ -776,16 +774,6 @@ 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;
     }
 
@@ -812,12 +800,6 @@ class EclCmdQueriesCopyQueryset : public EclCmdCommon
         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);
@@ -884,7 +866,6 @@ 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"
@@ -911,7 +892,6 @@ 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/services/ws_workunits/ws_workunitsQuerySets.cpp

@@ -3093,7 +3093,7 @@ class QueryCloner
                 queryActivationMode = entry.getPropInt("@activationMode");
             else if (entry.getPropBool("@makeActive"))
                 queryActivationMode = ACTIVATE_SUSPEND_PREVIOUS;
-            addQueryToQuerySet(workunit, destQuerySet, entry.queryProp("@name"), queryActivationMode, newQueryId, entry.queryProp("@userid"));
+            addQueryToQuerySet(workunit, destQuerySet, entry.queryProp("@name"), (WUQueryActivationOptions)queryActivationMode, newQueryId, entry.queryProp("@userid"));
             copiedQueryIds.append(newQueryId);
             IPropertyTree *info = entry.queryPropTree("Info");
             if (info)
@@ -3142,7 +3142,7 @@ class QueryCloner
         {
             existingQueryIds.append(existingQueryId.str());
             if (makeActive)
-                activateQuery(destQuerySet, activationMode, queryName, existingQueryId.str(), context->queryUserId());
+                activateQuery(destQuerySet, (WUQueryActivationOptions)activationMode, queryName, existingQueryId.str(), context->queryUserId());
             return;
         }
         addToBePublished(wuid, queryName, makeActive, context->queryUserId(), query);
@@ -3169,7 +3169,7 @@ class QueryCloner
         {
             existingQueryIds.append(existingQueryId.str());
             if (makeActive)
-                activateQuery(destQuerySet, activationMode, queryName, existingQueryId.str(), context->queryUserId());
+                activateQuery(destQuerySet, (WUQueryActivationOptions)activationMode, queryName, existingQueryId.str(), context->queryUserId());
             return;
         }
         StringBuffer newQueryId;
@@ -3365,19 +3365,7 @@ 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);
+    cloner.setActivationMode(req.getActivate());
 
     SCMStringBuffer process;
     StringBuffer publisherWuid(req.getDfuPublisherWuid());