Merge pull request #19029 from jakesmith/HPCC-32495-suppress-splitter…

…spill HPCC-32495 Rename splitterSpill option Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Aug 22, 2024 · 915aa6b · 915aa6b
2 parents 91b2fc1 + 5d8b586
commit 915aa6b
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/thorlcr/thorutil/thormisc.hpp b/thorlcr/thorutil/thormisc.hpp
@@ -54,7 +54,7 @@
 #define THOROPT_HDIST_TARGETWRITELIMIT "hdTargetLimit"       // Limit # of writer threads working on a single target                          (default = unbound, but picks round-robin)
 #define THOROPT_HDIST_COMP            "v9_4_hdCompressorType"   // Distribute compressor to use                                                  (default = "LZ4")
 #define THOROPT_HDIST_COMPOPTIONS     "v9_4_hdCompressorOptions" // Distribute compressor options, e.g. AES key                                   (default = "")
-#define THOROPT_SPLITTER_SPILL        "splitterSpill"           // Force splitters to spill or not, default is to adhere to helper setting       (default = -1)
+#define THOROPT_SPLITTER_SPILL        "v9_4_splitterSpill"      // Force splitters to spill or not, default is to adhere to helper setting       (default = -1)
 #define THOROPT_LOOP_MAX_EMPTY        "loopMaxEmpty"            // Max # of iterations that LOOP can cycle through with 0 results before errors  (default = 1000)
 #define THOROPT_SMALLSORT             "smallSortThreshold"      // Use minisort approach, if estimate size of data to sort is below this setting (default = 0)
 #define THOROPT_PARALLEL_FUNNEL       "parallelFunnel"          // Use parallel funnel impl. if !ordered                                         (default = true)
@@ -66,10 +66,10 @@
 #define THOROPT_LKJOIN_LOCALFAILOVER  "lkjoin_localfailover"    // Force SMART to failover to distributed local lookup join (for testing only)   (default = false)
 #define THOROPT_LKJOIN_HASHJOINFAILOVER "lkjoin_hashjoinfailover" // Force SMART to failover to hash join (for testing only)                     (default = false)
 #define THOROPT_MAX_KERNLOG           "max_kern_level"          // Max kernel logging level, to push to workunit, -1 to disable                  (default = 3)
-#define THOROPT_COMP_FORCELZW         "forceLZW"                // Forces file compression to use LZW                                            (default = false)
-#define THOROPT_COMP_FORCEFLZ         "forceFLZ"                // Forces file compression to use FLZ                                            (default = false)
-#define THOROPT_COMP_FORCELZ4         "forceLZ4"                // Forces file compression to use LZ4                                            (default = false)
-#define THOROPT_COMP_FORCELZ4HC       "forceLZ4HC"              // Forces file compression to use LZ4HC                                          (default = false)
+#define THOROPT_COMP_FORCELZW         "v9_4_forceLZW"           // Forces file compression to use LZW                                            (default = false)
+#define THOROPT_COMP_FORCEFLZ         "v9_4_forceFLZ"           // Forces file compression to use FLZ                                            (default = false)
+#define THOROPT_COMP_FORCELZ4         "v9_4_forceLZ4"           // Forces file compression to use LZ4                                            (default = false)
+#define THOROPT_COMP_FORCELZ4HC       "v9_4_forceLZ4HC"         // Forces file compression to use LZ4HC                                          (default = false)
 #define THOROPT_TRACE_ENABLED         "traceEnabled"            // Output from TRACE activity enabled                                            (default = false)
 #define THOROPT_TRACE_LIMIT           "traceLimit"              // Number of rows from TRACE activity                                            (default = 10)
 #define THOROPT_READ_CRC              "crcReadEnabled"          // Enabled CRC validation on disk reads if file CRC are available                (default = true)
@@ -105,7 +105,7 @@
 #define THOROPT_VALIDATE_FILE_TYPE    "validateFileType"        // validate file type compatibility, e.g. if on fire error if XML reading CSV    (default = true)
 #define THOROPT_MIN_REMOTE_CQ_INDEX_SIZE_MB "minRemoteCQIndexSizeMb" // minimum size of index file to enable server side handling                (default = 0, meaning use heuristic to determin)
 #define THOROPT_KJ_ASSUME_PRIMARY "keyedJoinAssumePrimary"      // assume primary part exists (don't check when mapping, which can be slow)
-#define THOROPT_COMPRESS_SORTOVERFLOW "compressSortOverflow"    // If global sort spills, compress the merged overflow file                      (default = true)
+#define THOROPT_COMPRESS_SORTOVERFLOW "v9_4_compressSortOverflow" // If global sort spills, compress the merged overflow file                      (default = true)
 #define THOROPT_TIME_ACTIVITIES "timeActivities"                // Time activities (default=true)
 #define THOROPT_MAX_ACTIVITY_CORES "maxActivityCores"           // controls number of default threads to use for very parallel phases (like sort/parallel join helper). (default = # of h/w cores)
 #define THOROPT_THOR_ROWCRC "THOR_ROWCRC"                       // Use a CRC checking row allocator (default=false)
@@ -114,7 +114,7 @@
 #define THOROPT_FAIL_ON_LEAKS "failOnLeaks"                     // If any leaks are detected at the end of graph, fail the query (default=false)
 #define THOROPT_SOAP_TRACE_LEVEL "soapTraceLevel"               // The trace SOAP level (default=1)
 #define THOROPT_SORT_ALGORITHM "sortAlgorithm"                  // The algorithm used to sort records (quicksort/mergesort)
-#define THOROPT_COMPRESS_ALLFILES "compressAllOutputs"          // Compress all output files (default: bare-metal=off, cloud=on)
+#define THOROPT_COMPRESS_ALLFILES "v9_4_compressAllOutputs"     // Compress all output files (default: bare-metal=off, cloud=on)
 #define THOROPT_AVOID_RENAME "avoidRename"                      // Avoid rename, write directly to target physical filenames (no temp file)