diff --git a/testing/regress/ecl/dfucopy.ecl b/testing/regress/ecl/dfusupercopy.ecl similarity index 90% rename from testing/regress/ecl/dfucopy.ecl rename to testing/regress/ecl/dfusupercopy.ecl index 536d4d74690..85156773c96 100644 --- a/testing/regress/ecl/dfucopy.ecl +++ b/testing/regress/ecl/dfusupercopy.ecl @@ -18,7 +18,7 @@ //noroxie //nohthor -import Std.System; +import Std.System.Thorlib; import Std.File AS FileServices; import $.setup; prefix := setup.Files(false, false).QueryFilePrefix; @@ -28,10 +28,6 @@ layout_user := RECORD STRING20 user; END; -layout_names := RECORD - STRING30 name; -END; - 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); @@ -46,12 +42,10 @@ SEQUENTIAL( 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.Copy(sourceLogicalName := prefix + 'superdata', destinationGroup := Thorlib.group(), destinationLogicalName := prefix + 'super_copy', ALLOWOVERWRITE := true), FileServices.DeleteLogicalFile(prefix + 'super_copy', true), - FileServices.DeleteOwnedSubFiles(prefix + 'superdata'), + FileServices.DeleteLogicalFile(prefix + 'superdata', true), FileServices.DeleteLogicalFile(prefix + 'subdata1', true), FileServices.DeleteLogicalFile(prefix + 'subdata2', true), FileServices.DeleteLogicalFile(prefix + 'subdata3', true), - FileServices.DeleteLogicalFile(prefix + 'superdata', true), ) - diff --git a/testing/regress/ecl/key/dfucopy.xml b/testing/regress/ecl/key/dfusupercopy.xml similarity index 100% rename from testing/regress/ecl/key/dfucopy.xml rename to testing/regress/ecl/key/dfusupercopy.xml