Merge pull request #5714 from ghalliday/issue11232

HPCC-11232 Default spotCseInIfDatasetConditions to on

Reviewed-By: Jamie Noss <james.noss@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

ecl/hqlcpp/hqlcpp.cpp

@@ -1579,7 +1579,7 @@ void HqlCppTranslator::cacheOptions()
         DebugOption(options.convertJoinToLookup,"convertJoinToLookup", true),
         DebugOption(options.convertJoinToLookupIfSorted,"convertJoinToLookupIfSorted", false),
         DebugOption(options.spotCSE,"spotCSE", true),
-        DebugOption(options.spotCseInIfDatasetConditions,"spotCseInIfDatasetConditions", false),
+        DebugOption(options.spotCseInIfDatasetConditions,"spotCseInIfDatasetConditions", true),
         DebugOption(options.optimizeNonEmpty,"optimizeNonEmpty", !targetThor()),                // not sure that it will be conditional resourced correctly for thor
         DebugOption(options.allowVariableRoxieFilenames,"allowVariableRoxieFilenames", false),
         DebugOption(options.foldConstantDatasets,"foldConstantDatasets", true),

ecl/hqlcpp/hqlhtcpp.cpp

@@ -2278,6 +2278,7 @@ void ActivityInstance::buildSuffix()
     const HqlCppOptions & options = translator.queryOptions();
     if (classStmt && (options.spotComplexClasses || options.showActivitySizeInGraph))
     {
+        //NOTE: The peephole optimizer means this is often vastly larger than the actual number of lines generated
         unsigned approxSize = calcTotalChildren(classStmt);
         if (options.spotComplexClasses && (approxSize >= options.complexClassesThreshold))
         {