Pārlūkot izejas kodu

Merge pull request #15113 from AttilaVamos/HPCC-26124-fix-8.2.x

HPCC-26124 The external.ecl and externalplane.ecl uses same file names and may clashes in parallel query mode.

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 4 gadi atpakaļ
vecāks
revīzija
783b989bd8

+ 1 - 1
testing/regress/ecl/external.ecl

@@ -9,7 +9,7 @@ ds := DATASET([{'a'}], rec);
 dropzonePath := File.GetDefaultDropZone() +'/' : STORED('dropzonePath');
 dropzonePath := File.GetDefaultDropZone() +'/' : STORED('dropzonePath');
 
 
 string getFName(string ext) := FUNCTION
 string getFName(string ext) := FUNCTION
- RETURN File.ExternalLogicalFileName('localhost', dropzonePath) + 'external' + ext;
+ RETURN File.ExternalLogicalFileName('localhost', dropzonePath)  + WORKUNIT + 'external' + ext;
 END;
 END;
 
 
 external1 := getFName('1');
 external1 := getFName('1');

+ 1 - 1
testing/regress/ecl/externalplane.ecl

@@ -27,7 +27,7 @@ ds := DATASET([{'a'}], rec);
 dropzone := 'mydropzone' : STORED('dropzone');
 dropzone := 'mydropzone' : STORED('dropzone');
 
 
 string getFName(string ext) := FUNCTION
 string getFName(string ext) := FUNCTION
- RETURN '~PLANE::' + dropzone + '::' + 'external' + ext;
+ RETURN '~PLANE::' + dropzone + '::'  + WORKUNIT + 'external' + ext;
 END;
 END;
 
 
 external1 := getFName('1');
 external1 := getFName('1');