HPCC-10298 CSV auto discovery should check the validity and uniqueness of

the discovered field name.

Fix field name uniqueness testing bug.

Signed-off-by: Attila Vamos <attila.vamos@gmail.com>

dali/ft/daftformat.cpp

@@ -624,21 +624,21 @@ void CCsvPartitioner::storeFieldName(const char * start, unsigned len)
                 fieldName.setCharAt(i, '_');
             }
         }
-
-        // Check discovered field name uniqueness
-        const char * fn = fieldName.toCharArray();
-        if ( fields->find(fn) != NULL )
-        {
-            time_t t;
-            time(&t);
-            fieldName.append('_').append(fieldCount).append('_').append((unsigned)t);
-        }
     }
     else
     {
         fieldName.append("field").append(fieldCount);
     }
 
+    // Check discovered field name uniqueness
+    const char * fn = fieldName.toCharArray();
+    if ( fields->find(fn) != NULL )
+    {
+        time_t t;
+        time(&t);
+        fieldName.append('_').append(fieldCount).append('_').append((unsigned)t);
+    }
+
     recordStructure.append(fieldName);
     recordStructure.append(";\n");
 
@@ -953,21 +953,21 @@ void CUtfPartitioner::storeFieldName(const char * start, unsigned len)
                 fieldName.setCharAt(i, '_');
             }
         }
-
-        // Check discovered field name uniqueness
-        const char * fn = fieldName.toCharArray();
-        if ( fields->find(fn) != NULL )
-        {
-            time_t t;
-            time(&t);
-            fieldName.append('_').append(fieldCount).append('_').append((unsigned)t);
-        }
     }
     else
     {
         fieldName.append("field").append(fieldCount);
     }
 
+    // Check discovered field name uniqueness
+    const char * fn = fieldName.toCharArray();
+    if ( fields->find(fn) != NULL )
+    {
+        time_t t;
+        time(&t);
+        fieldName.append('_').append(fieldCount).append('_').append((unsigned)t);
+    }
+
     recordStructure.append(fieldName);
     recordStructure.append(";\n");