optimized join query

aistairc · Sep 17, 2020 · 507489a · 507489a
1 parent 23b55cc
commit 507489a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/GeoFlink/StreamingJob.java b/src/main/java/GeoFlink/StreamingJob.java
@@ -260,9 +260,9 @@ public void cancel() {
 // DataStream<Tuple2<String, String>> spatialJoinStream = JoinQuery.SpatialJoinQuery(spatialPolygonStream, queryPointStream, radius, uGrid, windowSize, windowSlideStep);
 // spatialJoinStream.print();
 
- //----Modified Spatial Join using Candidate and Guaranteed Neighbors---
-// DataStream<Tuple2<String, String>> spatialJoinStreamModified = JoinQuery.SpatialJoinQueryModified(spatialPolygonStream, queryPointStream, radius, uGrid, windowSize, windowSlideStep);
-// spatialJoinStreamModified.print();
+ //----Optimized Spatial Join using Candidate and Guaranteed Neighbors---
+// DataStream<Tuple2<String, String>> spatialJoinStreamOptimized = JoinQuery.SpatialJoinQueryOptimized(spatialPolygonStream, queryPointStream, radius, uGrid, windowSize, windowSlideStep);
+// spatialJoinStreamOptimized.print();
  break;
  }
  case 10:{ // Join Query (Polygon-Polygon)
@@ -281,9 +281,9 @@ public void cancel() {
 // DataStream<Tuple2<String, String>> spatialJoinStream = JoinQuery.SpatialJoinQuery(spatialPolygonStream, queryPolygonStream, windowSlideStep, windowSize, radius, uGrid);
 // spatialJoinStream.print();
 
- //----Modified Spatial Join using Candidate and Guaranteed Neighbors---
-// DataStream<Tuple2<String, String>> spatialJoinStreamModified = JoinQuery.SpatialJoinQueryModified(spatialPolygonStream, queryPolygonStream, windowSlideStep, windowSize, radius, uGrid);
-// spatialJoinStreamModified.print();
+ //----Optimized Spatial Join using Candidate and Guaranteed Neighbors---
+// DataStream<Tuple2<String, String>> spatialJoinStreamOptimized = JoinQuery.SpatialJoinQueryOptimized(spatialPolygonStream, queryPolygonStream, windowSlideStep, windowSize, radius, uGrid);
+// spatialJoinStreamOptimized.print();
  break;
  }
  default:

diff --git a/src/main/java/GeoFlink/spatialOperators/JoinQuery.java b/src/main/java/GeoFlink/spatialOperators/JoinQuery.java
@@ -110,7 +110,7 @@ public boolean filter(Tuple2<String, String> value) throws Exception {
  }
 
  //--------------- (MODIFIED) GRID-BASED JOIN QUERY - POINT-POLYGON -----------------//
- public static DataStream<Tuple2<String, String>> SpatialJoinQueryModified(DataStream<Polygon> polygonStream, DataStream<Point> queryPointStream, double queryRadius, UniformGrid uGrid, int windowSize, int slideStep){
+ public static DataStream<Tuple2<String, String>> SpatialJoinQueryOptimized(DataStream<Polygon> polygonStream, DataStream<Point> queryPointStream, double queryRadius, UniformGrid uGrid, int windowSize, int slideStep){
 
  DataStream<Tuple2<Point,Boolean>> replicatedQueryStream = JoinQuery.getReplicatedQueryStreamModified(queryPointStream, queryRadius, uGrid);
  DataStream<Polygon> replicatedPolygonStream = polygonStream.flatMap(new HelperClass.ReplicatePolygonStream());
@@ -188,7 +188,7 @@ public boolean filter(Tuple2<String, String> value) throws Exception {
  }
 
  //--------------- (MODIFIED) GRID-BASED JOIN QUERY - POLYGON-POLYGON -----------------//
- public static DataStream<Tuple2<String,String>> SpatialJoinQueryModified(DataStream<Polygon> polygonStream, DataStream<Polygon> queryPolygonStream, int slideStep, int windowSize, double queryRadius, UniformGrid uGrid){
+ public static DataStream<Tuple2<String,String>> SpatialJoinQueryOptimized(DataStream<Polygon> polygonStream, DataStream<Polygon> queryPolygonStream, int slideStep, int windowSize, double queryRadius, UniformGrid uGrid){
  DataStream<Tuple2<Polygon,Boolean>> replicatedQueryStream = JoinQuery.getReplicatedQueryStreamModified(queryPolygonStream, uGrid, queryRadius);
  DataStream<Polygon> replicatedPolygonStream = polygonStream.flatMap(new HelperClass.ReplicatePolygonStream());