Merge remote-tracking branch 'upstream/dev-2.x' into immutable-leg

opentripplanner · Jan 20, 2025 · c206b82 · c206b82
2 parents ec2d61f + 447e7dc
commit c206b82
Show file tree

Hide file tree

Showing 19 changed files with 336 additions and 1,348 deletions.
diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml
@@ -91,7 +91,7 @@ jobs:
           cp otp-shaded/target/otp-shaded-*-SNAPSHOT.jar otp.jar
           java -Xmx32G -jar otp.jar --build --save test/performance/${{ matrix.location }}/
 
-      - name: Run speed test
+      - name: Run RAPTOR speed test
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
         env:
           PERFORMANCE_INFLUX_DB_PASSWORD: ${{ secrets.PERFORMANCE_INFLUX_DB_PASSWORD }}
@@ -113,3 +113,12 @@ jobs:
         with:
           name: ${{ matrix.location }}-flight-recorder
           path: application/${{ matrix.location }}-speed-test.jfr
+
+      - name: Run transfer cache speed test
+        if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
+        env:
+          PERFORMANCE_INFLUX_DB_PASSWORD: ${{ secrets.PERFORMANCE_INFLUX_DB_PASSWORD }}
+          SPEEDTEST_LOCATION: ${{ matrix.location }}
+          MAVEN_OPTS: "-Xmx50g -Dmaven.repo.local=/home/lenni/.m2/repository/"
+        run: |
+          mvn --projects application exec:java -Dexec.mainClass="org.opentripplanner.transit.speed_test.TransferCacheTest" -Dexec.classpathScope=test -Dexec.args="--dir=test/performance/${{ matrix.location }}"
diff --git a/application/src/client/index.html b/application/src/client/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/img/otp-logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>OTP Debug</title>
-    <script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2025/01/2025-01-11T19:23/assets/index-D--h-dOg.js"></script>
-    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2025/01/2025-01-11T19:23/assets/index-BDL0-veX.css">
+    <script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2025/01/2025-01-20T08:56/assets/index-BKHYHPIc.js"></script>
+    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2025/01/2025-01-20T08:56/assets/index-BDL0-veX.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java
@@ -199,7 +199,7 @@ private FlexAccessEgress createFlexAccessEgress(
       return null;
     }
 
-    final var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState, transferEdges);
+    final var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState[0], transferEdges);
 
     return finalStateOpt
       .map(finalState -> {

diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java
@@ -113,7 +113,7 @@ private Optional<DirectFlexPath> createDirectGraphPath(
 
     final State[] afterFlexState = flexEdge.traverse(accessNearbyStop.state);
 
-    var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState, egress.edges);
+    var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState[0], egress.edges);
 
     if (finalStateOpt.isEmpty()) {
       return Optional.empty();

diff --git a/.../main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java b/.../main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java
@@ -6,7 +6,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import org.opentripplanner.astar.model.GraphPath;
 import org.opentripplanner.framework.application.OTPFeature;
 import org.opentripplanner.framework.geometry.GeometryUtils;
@@ -39,8 +38,8 @@
 import org.opentripplanner.street.search.TraverseMode;
 import org.opentripplanner.street.search.request.StreetSearchRequest;
 import org.opentripplanner.street.search.request.StreetSearchRequestMapper;
-import org.opentripplanner.street.search.state.EdgeTraverser;
 import org.opentripplanner.street.search.state.State;
+import org.opentripplanner.street.search.state.StateEditor;
 import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate;
 import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
 import org.opentripplanner.transit.service.TransitService;
@@ -361,15 +360,24 @@ private List<Leg> mapNonTransitLeg(
           .build()
       );
     } else {
-      var legTransferSearchRequest = transferStreetRequest
-        .copyOf(createZonedDateTime(pathLeg.fromTime()).toInstant())
-        .build();
-      var initialStates = State.getInitialStates(
-        Set.of(edges.getFirst().getFromVertex()),
-        legTransferSearchRequest
-      );
-      var state = EdgeTraverser.traverseEdges(initialStates, edges);
-      var graphPath = new GraphPath<>(state.get());
+      StateEditor se = new StateEditor(edges.get(0).getFromVertex(), transferStreetRequest);
+      se.setTimeSeconds(createZonedDateTime(pathLeg.fromTime()).toEpochSecond());
+
+      State s = se.makeState();
+      ArrayList<State> transferStates = new ArrayList<>();
+      transferStates.add(s);
+      for (Edge e : edges) {
+        var states = e.traverse(s);
+        if (State.isEmpty(states)) {
+          s = null;
+        } else {
+          transferStates.add(states[0]);
+          s = states[0];
+        }
+      }
+
+      State[] states = transferStates.toArray(new State[0]);
+      var graphPath = new GraphPath<>(states[states.length - 1]);
 
       Itinerary subItinerary = graphPathToItineraryMapper.generateItinerary(graphPath);
 

diff --git a/...n/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java b/...n/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java
@@ -15,7 +15,7 @@
 import org.opentripplanner.street.model.edge.Edge;
 import org.opentripplanner.street.search.request.StreetSearchRequest;
 import org.opentripplanner.street.search.state.EdgeTraverser;
-import org.opentripplanner.street.search.state.State;
+import org.opentripplanner.street.search.state.StateEditor;
 import org.opentripplanner.utils.logging.Throttle;
 import org.opentripplanner.utils.tostring.ToStringBuilder;
 import org.slf4j.Logger;
@@ -97,8 +97,10 @@ public Optional<RaptorTransfer> asRaptorTransfer(StreetSearchRequest request) {
       );
     }
 
-    var initialStates = State.getInitialStates(Set.of(edges.getFirst().getFromVertex()), request);
-    var state = EdgeTraverser.traverseEdges(initialStates, edges);
+    StateEditor se = new StateEditor(edges.get(0).getFromVertex(), request);
+    se.setTimeSeconds(0);
+
+    var state = EdgeTraverser.traverseEdges(se.makeState(), edges);
 
     return state.map(s ->
       new DefaultRaptorTransfer(

diff --git a/application/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequest.java b/application/src/main/java/org/opentripplanner/street/search/request/StreetSearchRequest.java
@@ -124,10 +124,6 @@ public DataOverlayContext dataOverlayContext() {
     return dataOverlayContext;
   }
 
-  public StreetSearchRequestBuilder copyOf(Instant time) {
-    return copyOf(this).withStartTime(time);
-  }
-
   public StreetSearchRequestBuilder copyOfReversed(Instant time) {
     return copyOf(this).withStartTime(time).withArriveBy(!arriveBy);
   }

diff --git a/application/src/main/java/org/opentripplanner/street/search/state/EdgeTraverser.java b/application/src/main/java/org/opentripplanner/street/search/state/EdgeTraverser.java
@@ -2,10 +2,7 @@
 
 import java.util.Collection;
 import java.util.Optional;
-import org.opentripplanner.astar.model.ShortestPathTree;
 import org.opentripplanner.street.model.edge.Edge;
-import org.opentripplanner.street.model.vertex.Vertex;
-import org.opentripplanner.street.search.strategy.DominanceFunctions;
 
 /**
  * This is a very reduced version of the A* algorithm: from an initial state a number of edges are
@@ -17,49 +14,24 @@
  */
 public class EdgeTraverser {
 
-  public static Optional<State> traverseEdges(
-    final Collection<State> initialStates,
-    final Collection<Edge> edges
-  ) {
-    return traverseEdges(initialStates.toArray(new State[0]), edges);
-  }
-
-  public static Optional<State> traverseEdges(
-    final State[] initialStates,
-    final Collection<Edge> edges
-  ) {
-    if (edges.isEmpty()) {
-      return Optional.of(initialStates[0]);
-    }
-
-    // The shortest path tree is used to prune dominated parallel states. For example,
-    // CAR_PICKUP can return both a CAR/WALK state after each traversal of which only
-    // the optimal states need to be continued.
-    var dominanceFunction = new DominanceFunctions.MinimumWeight();
-    var spt = new ShortestPathTree<>(dominanceFunction);
-    for (State initialState : initialStates) {
-      spt.add(initialState);
-    }
-
-    Vertex lastVertex = null;
-    var isArriveBy = initialStates[0].getRequest().arriveBy();
+  public static Optional<State> traverseEdges(final State s, final Collection<Edge> edges) {
+    var state = s;
     for (Edge e : edges) {
-      var vertex = isArriveBy ? e.getToVertex() : e.getFromVertex();
-      var fromStates = spt.getStates(vertex);
-      if (fromStates == null || fromStates.isEmpty()) {
-        return Optional.empty();
+      var afterTraversal = e.traverse(state);
+      if (afterTraversal.length > 1) {
+        throw new IllegalStateException(
+          "Expected only a single state returned from edge %s but received %s".formatted(
+              e,
+              afterTraversal.length
+            )
+        );
       }
-
-      for (State fromState : fromStates) {
-        var newToStates = e.traverse(fromState);
-        for (State newToState : newToStates) {
-          spt.add(newToState);
-        }
+      if (State.isEmpty(afterTraversal)) {
+        return Optional.empty();
+      } else {
+        state = afterTraversal[0];
       }
-
-      lastVertex = isArriveBy ? e.getFromVertex() : e.getToVertex();
     }
-
-    return Optional.ofNullable(lastVertex).map(spt::getState);
+    return Optional.ofNullable(state);
   }
 }
diff --git a/application/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java b/application/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java
@@ -6,8 +6,6 @@ public class Coordinates {
 
   public static final Coordinate BERLIN = of(52.5212, 13.4105);
   public static final Coordinate BERLIN_BRANDENBURG_GATE = of(52.51627, 13.37770);
-  public static final Coordinate BERLIN_FERNSEHTURM = of(52.52084, 13.40934);
-  public static final Coordinate BERLIN_ADMIRALBRUCKE = of(52.49526, 13.415093);
   public static final Coordinate HAMBURG = of(53.5566, 10.0003);
   public static final Coordinate KONGSBERG_PLATFORM_1 = of(59.67216, 9.65107);
   public static final Coordinate BOSTON = of(42.36541, -71.06129);