HPCC4J-691 DFSClient: Column pruner not correctly cloning field defs

- Updated ColumnPruner to correctly clone child field defs

Signed-off-by: James McMullan [email protected]

dfsclient/src/main/java/org/hpccsystems/dfs/client/ColumnPruner.java

@@ -173,7 +173,7 @@ private FieldDef pruneFieldDefinition(FieldDef originalRecordDef, String path)
 
         if (fieldInfo.shouldCullChildren == false)
         {
-            return originalRecordDef;
+            return new FieldDef(originalRecordDef);
         }
 
         // Datasets are a special case. They will not have a component

dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSHPCCFile.java

@@ -192,6 +192,43 @@ public final void testGetProjectedRecordDefinition() throws HpccFileException
         Assert.assertEquals(3, projectedRecordDefinition.getNumDefs());
     }
 
+    private boolean testFieldDefsNotEquals(FieldDef fieldDef1, FieldDef fieldDef2)
+    {
+        for (int i = 0; i < fieldDef1.getNumDefs(); i++)
+        {
+            if (fieldDef1.getDef(i) == fieldDef2.getDef(i))
+            {
+                return false;
+            }
+
+            if (!testFieldDefsNotEquals(fieldDef1.getDef(i), fieldDef2.getDef(i)))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Test
+    public final void testProjectedRecordDefCloning() throws Exception 
+    {
+        FieldDef recordDef = mockHPCCFile.getRecordDefinition();
+
+        String[] fieldNames = new String[recordDef.getNumDefs()];
+        for (int i = 0; i < recordDef.getNumDefs(); i++)
+        {
+            fieldNames[i] = recordDef.getDef(i).getFieldName();
+        }
+
+        String projectList = String.join(",", fieldNames);
+        mockHPCCFile.setProjectList(projectList);
+        FieldDef projectedRecordDefinition = mockHPCCFile.getProjectedRecordDefinition();
+
+        // Ensure the projected record definition is a clone and not modifying the original record definition
+        assert(testFieldDefsNotEquals(recordDef, projectedRecordDefinition));
+    }
+
     @Test
     public final void testIsIndex()
     {