HPCC-31715 Change the default field translation mode

hpcc-systems · May 23, 2024 · 3b87b55 · 3b87b55
1 parent b7c9bd6
commit 3b87b55
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/helm/hpcc/values.schema.json b/helm/hpcc/values.schema.json
@@ -1865,7 +1865,7 @@
           "description": "Should the index node memory allocation flush the cache and retry if memory allocation fails"
         },
         "fieldTranslationEnabled": {
-          "default": "payload",
+          "default": "payloadRemoveOnly",
           "enum": ["false", "true", "payload", "payloadRemoveOnly"],
           "description": "Enables translation (where possible) of mismatched file layouts on-the-fly. Specify 'payload' to attempt to translate payload fields only"
         },

diff --git a/initfiles/componentfiles/configschema/xsd/eclagent.xsd b/initfiles/componentfiles/configschema/xsd/eclagent.xsd
@@ -57,7 +57,7 @@
                                   hpcc:presetValue="false"
                                   hpcc:tooltip="eclAgent analyzes workunit post-execution"/>
                     <xs:attribute name="fieldTranslationEnabled" hpcc:displayName="Enable Field Translation"
-                                  hpcc:presetValue="payload"
+                                  hpcc:presetValue="payloadRemoveOnly"
                                   hpcc:tooltip="Enables translation (where possible) of mismatched index layouts on-the-fly. Specify 'payload' to attempt to translate payload fields only">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">

diff --git a/initfiles/componentfiles/configschema/xsd/roxie.xsd b/initfiles/componentfiles/configschema/xsd/roxie.xsd
@@ -110,7 +110,7 @@
                                   hpcc:displayName="flushJHtreeCacheOnOOM" hpcc:presetValue="true"
                                   hpcc:tooltip="Should the index node memory allocation flush the cache and retry if memory allocation fails"/>
                     <xs:attribute name="fieldTranslationEnabled" hpcc:displayName="Enable Field Translation"
-                                  hpcc:presetValue="payload"
+                                  hpcc:presetValue="payloadRemoveOnly"
                                   hpcc:tooltip="Enables translation (where possible) of mismatched index layouts on-the-fly. Specify 'payload' to attempt to translate payload fields only">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">

diff --git a/initfiles/componentfiles/configschema/xsd/thor.xsd b/initfiles/componentfiles/configschema/xsd/thor.xsd
@@ -224,7 +224,7 @@
                 <xs:attribute name="httpGlobalIdHeader" type="xs:string" hpcc:displayName="HTTP GlobalId Header" hpcc:presetValue="HPCC-Global-Id"
                               hpcc:tooltip="HTTP Header field to use for sending and receiving GlobalId"/>
                 <xs:attribute name="fieldTranslationEnabled" hpcc:displayName="Enable Field Translation"
-                              hpcc:presetValue="payload"
+                              hpcc:presetValue="payloadRemoveOnly"
                               hpcc:tooltip="Enables translation (where possible) of mismatched index layouts on-the-fly. Specify 'payload' to attempt to translate payload fields only">
                     <xs:simpleType>
                         <xs:restriction base="xs:string">

diff --git a/initfiles/componentfiles/configxml/eclagent_config.xsd.in b/initfiles/componentfiles/configxml/eclagent_config.xsd.in
@@ -190,7 +190,7 @@
       </xs:annotation>
     </xs:attribute>
 
-    <xs:attribute name="fieldTranslationEnabled" use="optional" default="payload">
+    <xs:attribute name="fieldTranslationEnabled" use="optional" default="payloadRemoveOnly">
       <xs:annotation>
         <xs:appinfo>
           <tooltip>Enables translation (where possible) of mismatched file layouts on-the-fly. Specify 'payload' to attempt to translate payload fields only</tooltip>

diff --git a/initfiles/componentfiles/configxml/roxie.xsd.in b/initfiles/componentfiles/configxml/roxie.xsd.in
@@ -638,7 +638,7 @@
         </xs:appinfo>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="fieldTranslationEnabled" use="optional" default="payload">
+    <xs:attribute name="fieldTranslationEnabled" use="optional" default="payloadRemoveOnly">
       <xs:annotation>
         <xs:appinfo>
           <tooltip>Enables translation (where possible) of mismatched file layouts on-the-fly. Specify 'payload' to attempt to translate payload fields only</tooltip>

diff --git a/initfiles/componentfiles/configxml/thor.xsd.in b/initfiles/componentfiles/configxml/thor.xsd.in
@@ -677,7 +677,7 @@
         </xs:appinfo>
       </xs:annotation>
     </xs:attribute>
-    <xs:attribute name="fieldTranslationEnabled" use="optional" default="payload">
+    <xs:attribute name="fieldTranslationEnabled" use="optional" default="payloadRemoveOnly">
       <xs:annotation>
         <xs:appinfo>
           <tooltip>Enables translation (where possible) of mismatched file layouts on-the-fly. Specify 'payload' to attempt to translate payload fields only</tooltip>

diff --git a/initfiles/etc/DIR_NAME/environment.xml.in b/initfiles/etc/DIR_NAME/environment.xml.in
@@ -68,7 +68,7 @@
                 enableKeyDiff="true"
                 enableSysLog="true"
                 fastLaneQueue="true"
-                fieldTranslationEnabled="payload"
+                fieldTranslationEnabled="payloadRemoveOnly"
                 flushJHtreeCacheOnOOM="true"
                 forceStdLog="false"
                 heapRetainMemory="false"

diff --git a/roxie/ccd/ccdmain.cpp b/roxie/ccd/ccdmain.cpp
@@ -103,7 +103,7 @@ unsigned defaultTraceLimit = 10;
 unsigned watchActivityId = 0;
 unsigned testAgentFailure = 0;
 RelaxedAtomic<unsigned> restarts;
-RecordTranslationMode fieldTranslationEnabled = RecordTranslationMode::Payload;
+RecordTranslationMode fieldTranslationEnabled = RecordTranslationMode::PayloadRemoveOnly;
 bool mergeAgentStatistics = true;
 PTreeReaderOptions defaultXmlReadFlags = ptr_ignoreWhiteSpace;
 bool runOnce = false;
@@ -1183,7 +1183,7 @@ int CCD_API roxie_main(int argc, const char *argv[], const char * defaultYaml)
         agentQueryReleaseDelaySeconds = topology->getPropInt("@agentQueryReleaseDelaySeconds", topology->getPropInt("@slaveQueryReleaseDelaySeconds", 60));  // legacy name
         coresPerQuery = topology->getPropInt("@coresPerQuery", 0);
 
-        fieldTranslationEnabled = RecordTranslationMode::Payload;
+        fieldTranslationEnabled = RecordTranslationMode::PayloadRemoveOnly;
         const char *val = topology->queryProp("@fieldTranslationEnabled");
         if (val)
             fieldTranslationEnabled = getTranslationMode(val, false);

diff --git a/roxie/ccd/ccdstate.cpp b/roxie/ccd/ccdstate.cpp
@@ -2463,7 +2463,7 @@ class CRoxiePackageSetManager : implements IRoxieQueryPackageManagerSet, impleme
                 if (val)
                     fieldTranslationEnabled = getTranslationMode(val, false);
                 else
-                    fieldTranslationEnabled = RecordTranslationMode::Payload;
+                    fieldTranslationEnabled = RecordTranslationMode::PayloadRemoveOnly;
                 val = getTranslationModeText(fieldTranslationEnabled);
                 topology->setProp("@fieldTranslationEnabled", val);
             }

diff --git a/rtl/eclrtl/rtldynfield.cpp b/rtl/eclrtl/rtldynfield.cpp
@@ -36,10 +36,10 @@
 
 extern ECLRTL_API RecordTranslationMode getTranslationMode(const char *val, bool isLocal)
 {
-    if (isEmptyString(val) || strToBool(val) || strieq(val, "payload"))
-        return RecordTranslationMode::Payload;
-    else if (strieq(val, "payloadRemoveOnly"))
+    if (isEmptyString(val) || strToBool(val) || strieq(val, "payloadRemoveOnly"))
         return RecordTranslationMode::PayloadRemoveOnly;
+    else if (strieq(val, "payload"))
+        return RecordTranslationMode::Payload;
     else if (strieq(val, "alwaysDisk") || strieq(val, "disk"))
     {
         if (!isLocal)

diff --git a/testing/regress/environment.xml.in b/testing/regress/environment.xml.in
@@ -65,7 +65,7 @@
                 enableKeyDiff="true"
                 enableSysLog="true"
                 fastLaneQueue="true"
-                fieldTranslationEnabled="payload"
+                fieldTranslationEnabled="payloadRemoveOnly"
                 flushJHtreeCacheOnOOM="true"
                 forceStdLog="false"
                 heapRetainMemory="false"