Simplify regression test

Signed-off-by: Shamser Ahmed <shamser.ahmed@lexisnexis.com>
hpcc-systems · Oct 2, 2024 · 0c0b8db · 0c0b8db
1 parent 9a942ea
commit 0c0b8db
Showing 1 changed file with 9 additions and 39 deletions.
diff --git a/testing/regress/ecl/dfucopy.ecl b/testing/regress/ecl/dfucopy.ecl
@@ -32,49 +32,19 @@ layout_names := RECORD
    STRING30 name;
 END;
 
-users1 := DATASET([{'Ned'},{'Robert'}, {'Jaime'}, {'Catelyn'}, {'Cersei'}, {'Daenerys'}, {'Jon'}], layout_user );
-users2 := DATASET([{'Sansa'}, {'Arya'}, {'Robb'}, {'Theon'}, {'Bran'}, {'Joffrey'}, {'Hound'}, {'Tyrion'}], layout_user );
-users3 := DATASET([{'Arya'}, {'Robb'}, {'Theon'}, {'Bran'}, {'Joffrey'}, {'Hound'}, {'Tyrion'}], layout_user );
-
-names := DATASET([{'Jack'},{'Oliver'},{'James'},{'Charlie'},{'Harris'},{'Lewis'},{'Leo'},{'Noah'},{'Alfie'},{'Rory'},{'Alexander'},{'Max'},{'Logan'},
-                  {'Lucas'},{'Harry'},{'Theo'},{'Thomas'},{'Brodie'},{'Archie'},{'Jacob'},{'Finlay'},{'Finn'},{'Daniel'},{'Joshua'},{'Oscar'},{'Arthur'},
-                  {'Hunter'},{'Ethan'},{'Mason'},{'Olivia'},{'Emily'},{'Isla'},{'Sophie'},{'Ella'},{'Ava'},{'Amelia'},{'Grace'},{'Freya'},{'Charlotte'},
-                  {'Jessica'},{'Lucy'},{'Ellie'},{'Sophia'},{'Aria'},{'Lily'},{'Harper'},{'Mia'},{'Rosie'},{'Millie'},{'Evie'},{'Eilidh'},{'Ruby'},
-                  {'Willow'},{'Anna'},{'Maisie'},{'Hannah'},{'Eva'},{'Chloe'}], layout_names);
-layout_rec := RECORD
-  STRING20 User;
-  STRING20 FirstName;
-  INTEGER id; 
-END;
-
-layout_rec f(layout_user l, layout_names r, INTEGER c) := TRANSFORM
-  SELF.user := TRIM(l.user,right)  + (c % 10000);
-  SELF.FirstName := r.name;
-  SELF.id := c;
-END;
-
-v1 := JOIN(users1, names, true, f(LEFT,RIGHT,COUNTER), ALL);
-v2 := JOIN(users2, names, true, f(LEFT,RIGHT,COUNTER), ALL);
-v3 := JOIN(users3, names, true, f(LEFT,RIGHT,COUNTER), ALL);
-
-layout_rec addCount(layout_rec l, INTEGER c) := TRANSFORM
-  SELF.id :=  c;
-  SELF := L;
-END;
-
-d1 := DISTRIBUTE(NORMALIZE(v1, 1000, addCount(LEFT, COUNTER)), HASH32(id));
-d2 := DISTRIBUTE(NORMALIZE(v2, 1000, addCount(LEFT, COUNTER)), HASH32(id));
-d3 := DISTRIBUTE(NORMALIZE(v3, 1000, addCount(LEFT, COUNTER)), HASH32(id));
+ds1 := DATASET([{'Ned'},{'Robert'}, {'Jaime'}, {'Catelyn'}, {'Cersei'}, {'Daenerys'}, {'Jon'}], layout_user, DISTRIBUTED );
+ds2 := DATASET([{'Sansa'}, {'Arya'}, {'Robb'}, {'Theon'}, {'Bran'}, {'Joffrey'}, {'Hound'}, {'Tyrion'}], layout_user, DISTRIBUTED);
+ds3 := DATASET([{'Arya'}, {'Robb'}, {'Theon'}, {'Bran'}, {'Joffrey'}, {'Hound'}, {'Tyrion'}], layout_user, DISTRIBUTED);
 
 SEQUENTIAL(
-    OUTPUT(d1, , prefix + 'subdata1', OVERWRITE),
-    OUTPUT(d2, , prefix + 'subdata2', OVERWRITE),
-    OUTPUT(d3, , prefix + 'subdata3', OVERWRITE),
+    OUTPUT(ds1, , prefix + 'subdata1', OVERWRITE),
+    OUTPUT(ds2, , prefix + 'subdata2', OVERWRITE),
+    OUTPUT(ds3, , prefix + 'subdata3', OVERWRITE),
     FileServices.CreateSuperFile(prefix + 'superdata'),
     FileServices.StartSuperFileTransaction(),
-    FileServices.AddSuperFile(prefix + 'superdata',prefix + 'subdata1'),
-    FileServices.AddSuperFile(prefix + 'superdata',prefix + 'subdata2'),
-    FileServices.AddSuperFile(prefix + 'superdata',prefix + 'subdata3'),
+    FileServices.AddSuperFile(prefix + 'superdata', prefix + 'subdata1'),
+    FileServices.AddSuperFile(prefix + 'superdata', prefix + 'subdata2'),
+    FileServices.AddSuperFile(prefix + 'superdata', prefix + 'subdata3'),
     FileServices.FinishSuperFileTransaction(),
     FileServices.Copy(sourceLogicalName := prefix + 'superdata', destinationGroup:= 'mythor', destinationLogicalName := prefix + 'super_copy', ALLOWOVERWRITE := true),
     FileServices.DeleteLogicalFile(prefix+'super_copy', true),