Explorar o código

Merge pull request #6850 from ghalliday/issue12859

HPCC-12859 Update regression test to match new multi file support

Reviewed-By:Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman %!s(int64=10) %!d(string=hai) anos
pai
achega
db4df18037
Modificáronse 1 ficheiros con 28 adicións e 19 borrados
  1. 28 19
      testing/regress/ecl/implicitkeydistribute.ecl

+ 28 - 19
testing/regress/ecl/implicitkeydistribute.ecl

@@ -15,24 +15,33 @@
     limitations under the License.
 ############################################################################## */
 
+//version multiPart=true
+//version multiPart=false
+
+import ^ as root;
+multiPart := #IFDEFINED(root.multiPart, false);
+useSequential := #IFDEFINED(root.useSequential, false);
+
+//--- end of version configuration ---
+
+#onwarning (2309, ignore);      // remove complaint aboute filtered right preventing keyed join
+#onwarning (4515, ignore);
+
 import $.setup;
 
-EXPORT ImplicitKeyDistribute(string source = 'thorlcr') := function
-
-    files := setup.files(source, false);
-
-    inlineDs := dataset([
-            {'AAAA','AAA'},
-            {'CLAIRE','BAYLISS'},
-            {'KIMBERLY','SMITH'},
-            {'ZZZ','ZZZ'}]
-            , { string first, STRING last} );
-            
-    myIndex := files.DG_VarIndex(dg_lastname != '');
-    
-    j := JOIN(inlineDs, myIndex, LEFT.last = RIGHT.dg_lastname AND LEFT.first = RIGHT.dg_firstName);
-    
-    gr := TABLE(j, { last, cnt := COUNT(GROUP) }, last); 
-    
-    RETURN gr;
-END;
+files := setup.files(multiPart, false);
+
+inlineDs := dataset([
+        {'AAAA','AAA'},
+        {'CLAIRE','BAYLISS'},
+        {'KIMBERLY','SMITH'},
+        {'ZZZ','ZZZ'}]
+        , { string first, STRING last} );
+        
+myIndex := files.DG_VarIndex(dg_lastname != '');
+
+j := JOIN(inlineDs, myIndex, LEFT.last = RIGHT.dg_lastname AND LEFT.first = RIGHT.dg_firstName);
+
+gr := TABLE(j, { last, cnt := COUNT(GROUP) }, last); 
+
+gr;