Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-9.4.x

Author: jakesmith

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

@@ -65,8 +65,9 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class DFSReadWriteTest extends BaseRemoteTest
 {
-    private static final String[] datasets       = { "~benchmark::integer::20kb", "~unit_test::all_types::thor", "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" };
-    private static final int[]    expectedCounts = { 1250, 5600, 10000, 10000, 10000, 10000};
+    // Note: These datasets are generated by dfsclient/src/target/resources/generate-datasets.ecl
+    private static final String[] datasets       = { "~benchmark::integer::20kb", "~unit_test::all_types::thor", "~unit_test::all_types::json", "~unit_test::all_types::csv" };
+    private static final int[]    expectedCounts = { 1250, 100000, 100000, 100000};
 
     //use until standard test is working
     //        private static final String[] datasets       = { "~benchmark::integer::20kb", "~benchmark::all_types::200kb"};//, "~unit_test::all_types::xml", "~unit_test::all_types::json", "~unit_test::all_types::csv" };

dfsclient/src/test/resources/generate-datasets.ecl

@@ -2,7 +2,7 @@ IMPORT Std;
 
 unique_keys :=  100000;  // Should be less than number of records
 unique_values := 10212; // Should be less than number of records
-totalrecs1 := 10000;
+totalrecs1 := 100000;
 
 childRec := {STRING8 childField1, INTEGER8 childField2, REAL8 childField3};