Move OD pairs limit check into RegionalTask

Author: trevorgerhardt

src/main/java/com/conveyal/analysis/controllers/RegionalAnalysisController.java

@@ -450,7 +450,7 @@ private RegionalAnalysis createRegionalAnalysis (Request req, Response res) thro
             task.destinationPointSets = new PointSet[] {
                     PointSetCache.readFreeFormFromFileStore(task.destinationPointSetKeys[0])
             };
-            MultiOriginAssembler.ensureOdPairsUnderLimit(task, task.destinationPointSets[0]);
+            task.checkIsUnderOdPairLimit(task.destinationPointSets[0]);
         }
         if (task.recordTimes) {
             checkArgument(

src/main/java/com/conveyal/analysis/results/MultiOriginAssembler.java

@@ -1,10 +1,7 @@
 package com.conveyal.analysis.results;
 
-import com.conveyal.analysis.AnalysisServerException;
 import com.conveyal.analysis.components.broker.Job;
 import com.conveyal.file.FileStorageKey;
-import com.conveyal.r5.analyst.PointSet;
-import com.conveyal.r5.analyst.cluster.RegionalTask;
 import com.conveyal.r5.analyst.cluster.RegionalWorkResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,10 +21,6 @@ public class MultiOriginAssembler {
 
     public static final Logger LOG = LoggerFactory.getLogger(MultiOriginAssembler.class);
 
-    private static final int MAX_FREEFORM_OD_PAIRS = 16_000_000;
-
-    private static final int MAX_FREEFORM_DESTINATIONS = 4_000_000;
-
     /**
      * The object representing the progress of the regional analysis as tracked by the broker.
      * It may appear job.templateTask has all the information needed, making the regionalAnalysis field
@@ -67,23 +60,6 @@ public MultiOriginAssembler (Job job, List<RegionalResultWriter> resultWriters)
         this.originsReceived = new BitSet(job.nTasksTotal);
     }
 
-    /**
-     * Check that origin and destination sets are not too big for generating CSV files.
-     */
-    public static void ensureOdPairsUnderLimit(RegionalTask task, PointSet destinationPointSet) {
-        // This requires us to have already loaded this destination pointset instance into the transient field.
-        if ((task.recordTimes || task.includePathResults) && !task.oneToOne) {
-            if (task.getTasksTotal() * destinationPointSet.featureCount() > MAX_FREEFORM_OD_PAIRS ||
-                    destinationPointSet.featureCount() > MAX_FREEFORM_DESTINATIONS
-            ) {
-                throw new AnalysisServerException(String.format(
-                        "Freeform requests limited to %d destinations and %d origin-destination pairs.",
-                        MAX_FREEFORM_DESTINATIONS, MAX_FREEFORM_OD_PAIRS
-                ));
-            }
-        }
-    }
-
     /**
      * There is a bit of logic in this method that wouldn't strictly need to be synchronized (the dimension checks) but
      * those should take a trivial amount of time. For safety and simplicity we synchronize the whole method. The

src/main/java/com/conveyal/file/FileUtils.java

@@ -1,15 +1,6 @@
 package com.conveyal.file;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.RandomAccessFile;
+import java.io.*;
 import java.nio.file.Files;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
@@ -92,9 +83,8 @@ public static void transferFromFileTo(File file, OutputStream os) {
      */
     public static File gzipFile(File file) {
         try {
-            var gzippedFile = createScratchFile();
-            var gzippedOs = new GZIPOutputStream(getOutputStream(gzippedFile));
-            transferFromFileTo(file, gzippedOs);
+            File gzippedFile = createScratchFile();
+            transferFromFileTo(file, new GZIPOutputStream(getOutputStream(gzippedFile)));
             return gzippedFile;
         } catch (IOException e) {
             throw new RuntimeException(e);

src/main/java/com/conveyal/r5/analyst/cluster/RegionalTask.java

@@ -10,6 +10,8 @@
  */
 public class RegionalTask extends AnalysisWorkerTask implements Cloneable {
 
+    public static final int MAX_FREEFORM_OD_PAIRS = 16_000_000;
+    public static final int MAX_FREEFORM_DESTINATIONS = 4_000_000;
     /**
      * The storage key for the pointset we will compute access to (e.g. regionId/datasetId.grid).
      * This is named grid instead of destinationPointSetId for backward compatibility, namely the ability to start
@@ -122,4 +124,20 @@ public int getTasksTotal() {
         }
     }
 
+    /**
+     * Check that origin and destination sets are not too big for generating CSV files.
+     */
+    public void checkIsUnderOdPairLimit(PointSet destinationPointSet) {
+        // This requires us to have already loaded this destination pointset instance into the transient field.
+        if ((recordTimes || includePathResults) && !oneToOne) {
+            if (getTasksTotal() * destinationPointSet.featureCount() > MAX_FREEFORM_OD_PAIRS ||
+                    destinationPointSet.featureCount() > MAX_FREEFORM_DESTINATIONS
+            ) {
+                throw new RuntimeException(String.format(
+                        "Freeform requests limited to %d destinations and %d origin-destination pairs.",
+                        MAX_FREEFORM_DESTINATIONS, MAX_FREEFORM_OD_PAIRS
+                ));
+            }
+        }
+    }
 }