HPCC-8562 Remove a couple more options

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

ecl/hqlcpp/hqlcpp.cpp

@@ -1587,7 +1587,6 @@ void HqlCppTranslator::cacheOptions()
         DebugOption(options.sortIndexPayload,"sortIndexPayload", true),
         DebugOption(options.foldFilter,"foldFilter", true),
         DebugOption(options.finalizeAllRows, "finalizeAllRows", false),
-        DebugOption(options.finalizeAllVariableRows, "finalizeAllVariableRows", true),
         DebugOption(options.maxLocalRowSize , "maxLocalRowSize", MAX_LOCAL_ROW_SIZE),
         DebugOption(options.optimizeGraph,"optimizeGraph", true),
         DebugOption(options.optimizeChildGraph,"optimizeChildGraph", false),
@@ -1676,7 +1675,6 @@ void HqlCppTranslator::cacheOptions()
         DebugOption(options.serializeRowsetInExtract,"serializeRowsetInExtract", false),
         DebugOption(options.optimizeInSegmentMonitor,"optimizeInSegmentMonitor", true),
         DebugOption(options.testIgnoreMaxLength,"testIgnoreMaxLength", false),
-        DebugOption(options.limitMaxLength,"limitMaxLength", false),
         DebugOption(options.trackDuplicateActivities,"trackDuplicateActivities", false),
         DebugOption(options.showActivitySizeInGraph,"showActivitySizeInGraph", false),
         DebugOption(options.addLocationToCpp,"addLocationToCpp", false),
@@ -1776,7 +1774,6 @@ void HqlCppTranslator::cacheOptions()
         options.useLinkedRawIterator = true;
         options.useLinkedNormalize = true;
         options.finalizeAllRows = true;     // inline temporary rows should actually be ok.
-        options.finalizeAllVariableRows = true;
     }
 
     postProcessOptions();
@@ -1785,8 +1782,6 @@ void HqlCppTranslator::cacheOptions()
 void HqlCppTranslator::postProcessOptions()
 {
 //Any post processing - e.g., dependent flags goes here...
-    options.finalizeAllVariableRows = true;
-
     options.optimizeDiskFlag = 0;
     if (options.optimizeInlineSource) 
         options.optimizeDiskFlag |= CSFnewinline;

ecl/hqlcpp/hqlcpp.ipp

@@ -621,7 +621,6 @@ struct HqlCppOptions
     bool                sortIndexPayload;
     bool                foldFilter;
     bool                finalizeAllRows;
-    bool                finalizeAllVariableRows;
     bool                optimizeGraph;
     bool                optimizeChildGraph ;
     bool                orderDiskFunnel;
@@ -690,7 +689,6 @@ struct HqlCppOptions
     bool                serializeRowsetInExtract;
     bool                optimizeInSegmentMonitor;
     bool                testIgnoreMaxLength;
-    bool                limitMaxLength;
     bool                trackDuplicateActivities;               // for diagnosing problems with code becoming duplicated
     bool                showActivitySizeInGraph;
     bool                addLocationToCpp;

ecl/hqlcpp/hqlhtcpp.cpp

@@ -1511,7 +1511,7 @@ bool HqlCppTranslator::tempRowRequiresFinalize(IHqlExpression * record) const
 {
     if (recordRequiresDestructor(record) || options.finalizeAllRows)
         return true;
-    if (options.finalizeAllVariableRows && isVariableSizeRecord(record))
+    if (isVariableSizeRecord(record))
         return true;
     return false;
 }
@@ -14564,9 +14564,6 @@ ABoundActivity * HqlCppTranslator::doBuildActivitySerialize(BuildCtx & ctx, IHql
     BuildCtx funcctx(instance->startctx);
     funcctx.addQuotedCompound("virtual size32_t transform(ARowBuilder & crSelf, const void * _left)");
 
-    assertex(!options.limitMaxLength);      //need more thought
-
-
     // Bind left to "left" and right to RIGHT
     BoundRow * leftCursor = bindTableCursor(funcctx, dataset, "_left");
     BoundRow * selfCursor = bindSelf(funcctx, expr, "crSelf");

ecl/hqlcpp/hqlresource.cpp

@@ -528,17 +528,7 @@ IHqlExpression * CResourceOptions::createSpillName(bool isGraphResult)
     StringBuffer s;
     s.append("~spill::");
     getUniqueId(s);
-    if (!mangleSpillNameWithWuid)
-        return createConstant(s.str());
-    s.append("_");
-    if (filenameMangler)
-    {
-        s.append(filenameMangler);
-        return createConstant(s.str());
-    }
-
-    ITypeInfo * type = makeStringType(UNKNOWN_LENGTH, NULL, NULL);
-    return createValue(no_concat, type, createConstant(s.str()), createValue(no_wuid, LINK(type)));
+    return createConstant(s.str());
 }
 
 //---------------------------------------------------------------------------
@@ -1758,17 +1748,8 @@ EclResourcer::EclResourcer(IErrorReceiver * _errors, IConstWorkUnit * _wu, Clust
     insideNeverSplit = false;
     insideSteppedNeverSplit = false;
     sequential = false;
-    options.mangleSpillNameWithWuid = false;
     options.minimizeSpillSize = _translatorOptions.minimizeSpillSize;
 
-    bool wuidIsConstant = (targetClusterType == RoxieCluster) || !wu->getCloneable();
-    if (wuidIsConstant)
-    {
-        SCMStringBuffer wuNameText;
-        wu->getWuid(wuNameText);
-        options.filenameMangler.set(wuNameText.str());
-    }
-
     unsigned totalMemory = _translatorOptions.resourceMaxMemory ? _translatorOptions.resourceMaxMemory : DEFAULT_TOTAL_MEMORY;
     unsigned maxSockets = _translatorOptions.resourceMaxSockets ? _translatorOptions.resourceMaxSockets : DEFAULT_MAX_SOCKETS;
     unsigned maxActivities = _translatorOptions.resourceMaxActivities ? _translatorOptions.resourceMaxActivities : DEFAULT_MAX_ACTIVITIES;

ecl/hqlcpp/hqlresource.ipp

@@ -58,7 +58,6 @@ public:
     bool     allowSplitBetweenSubGraphs;
     bool     preventKeyedSplit;
     bool     preventSteppedSplit;
-    bool     mangleSpillNameWithWuid;
     bool     minimizeSkewBeforeSpill;
     bool     useMpForDistribute;
     bool     expandSingleConstRow;
@@ -70,7 +69,6 @@ public:
     IHqlExpression * graphIdExpr;
     unsigned nextResult;
     unsigned clusterSize;
-    StringAttr filenameMangler;
     ClusterType targetClusterType;
 
     //Used