diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 732baed..c5a8526 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -72,5 +72,4 @@ jobs: - name: Build + generate + smoke tests # generate-sources runs codegen_jvm.py --engine flink over the installed jar's full surface; # the smoke tests exercise the facades against the freshly built libmeos from /usr/local/lib. - working-directory: flink-processor run: mvn -B -Dmeos.lib.dir=/usr/local/lib -Dmeos.enabled=true clean test diff --git a/.gitignore b/.gitignore index 7ed2aac..11fb378 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,6 @@ target/ __pycache__/ **/__pycache__/ -# Maven build output -flink-processor/target/ # Derived generator input — the MEOS catalog is staged in CI from upstream # MobilityDB master (provision-meos), never committed. diff --git a/flink-processor/Dockerfile b/benchmark/Dockerfile similarity index 100% rename from flink-processor/Dockerfile rename to benchmark/Dockerfile diff --git a/flink-processor/Dockerfile_q8_meos_kalman b/benchmark/Dockerfile_q8_meos_kalman similarity index 100% rename from flink-processor/Dockerfile_q8_meos_kalman rename to benchmark/Dockerfile_q8_meos_kalman diff --git a/flink-processor/docs/benchmark-results.md b/benchmark/docs/benchmark-results.md similarity index 100% rename from flink-processor/docs/benchmark-results.md rename to benchmark/docs/benchmark-results.md diff --git a/benchmark/pom.xml b/benchmark/pom.xml new file mode 100644 index 0000000..f03570b --- /dev/null +++ b/benchmark/pom.xml @@ -0,0 +1,208 @@ + + + 4.0.0 + + + org.mobilitydb.flink + mobility-flink-parent + 1.0-SNAPSHOT + + + + flink-kafka2postgres + + + + + aisdata.Query1_Main + + **/sedona/** + + + + + org.mobilitydb.flink + mobility-flink-binding + ${project.version} + + + + org.apache.flink + flink-connector-kafka + ${flink.kafka.version} + + + org.apache.flink + flink-table-api-java-bridge + ${flink.version} + + + + org.apache.flink + flink-table-planner_2.12 + ${flink.version} + + + + org.locationtech.jts + jts-core + 1.18.1 + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + 2.14.3 + + + + org.slf4j + slf4j-api + 1.7.30 + + + org.slf4j + slf4j-simple + 1.7.30 + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + runtime + + + org.apache.logging.log4j + log4j-api + ${log4j.version} + runtime + + + org.apache.logging.log4j + log4j-core + ${log4j.version} + runtime + + + + org.postgresql + postgresql + 42.3.1 + + + com.google.guava + guava + 32.1.3-jre + + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + test + + + + + + + src/main/resources + + + + + maven-compiler-plugin + + + ${sedona.source.excludes} + + + ${sedona.source.excludes} + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.1 + + + package + + shade + + + false + + + *:* + + + META-INF.versions.9.module-info + org.apache.flink:flink-shaded-force-shading + com.google.code.findbugs:jsr305 + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + ${queryMainClass} + + + + + + + + + + + + + sedona + + nothing-excluded/** + + + + org.apache.sedona + sedona-flink-shaded_2.12 + 1.9.0 + + + org.datasyslab + geotools-wrapper + 1.8.1-33.1 + + + + + diff --git a/flink-processor/run_q1.sh b/benchmark/run_q1.sh similarity index 100% rename from flink-processor/run_q1.sh rename to benchmark/run_q1.sh diff --git a/flink-processor/run_q2.sh b/benchmark/run_q2.sh similarity index 100% rename from flink-processor/run_q2.sh rename to benchmark/run_q2.sh diff --git a/flink-processor/run_q3.sh b/benchmark/run_q3.sh similarity index 100% rename from flink-processor/run_q3.sh rename to benchmark/run_q3.sh diff --git a/flink-processor/run_q4.sh b/benchmark/run_q4.sh similarity index 100% rename from flink-processor/run_q4.sh rename to benchmark/run_q4.sh diff --git a/flink-processor/run_q5.sh b/benchmark/run_q5.sh similarity index 100% rename from flink-processor/run_q5.sh rename to benchmark/run_q5.sh diff --git a/flink-processor/run_q6.sh b/benchmark/run_q6.sh similarity index 100% rename from flink-processor/run_q6.sh rename to benchmark/run_q6.sh diff --git a/flink-processor/run_q7.sh b/benchmark/run_q7.sh similarity index 100% rename from flink-processor/run_q7.sh rename to benchmark/run_q7.sh diff --git a/flink-processor/run_q8.sh b/benchmark/run_q8.sh similarity index 100% rename from flink-processor/run_q8.sh rename to benchmark/run_q8.sh diff --git a/flink-processor/run_q9.sh b/benchmark/run_q9.sh similarity index 100% rename from flink-processor/run_q9.sh rename to benchmark/run_q9.sh diff --git a/flink-processor/run_query.sh b/benchmark/run_query.sh similarity index 100% rename from flink-processor/run_query.sh rename to benchmark/run_query.sh diff --git a/flink-processor/src/main/java/aisdata/AISData.java b/benchmark/src/main/java/aisdata/AISData.java similarity index 100% rename from flink-processor/src/main/java/aisdata/AISData.java rename to benchmark/src/main/java/aisdata/AISData.java diff --git a/flink-processor/src/main/java/aisdata/AISDataDeserializationSchema.java b/benchmark/src/main/java/aisdata/AISDataDeserializationSchema.java similarity index 100% rename from flink-processor/src/main/java/aisdata/AISDataDeserializationSchema.java rename to benchmark/src/main/java/aisdata/AISDataDeserializationSchema.java diff --git a/flink-processor/src/main/java/aisdata/Main.java b/benchmark/src/main/java/aisdata/Main.java similarity index 100% rename from flink-processor/src/main/java/aisdata/Main.java rename to benchmark/src/main/java/aisdata/Main.java diff --git a/flink-processor/src/main/java/aisdata/Query1_Main.java b/benchmark/src/main/java/aisdata/Query1_Main.java similarity index 100% rename from flink-processor/src/main/java/aisdata/Query1_Main.java rename to benchmark/src/main/java/aisdata/Query1_Main.java diff --git a/flink-processor/src/main/java/aisdata/Query2_Main.java b/benchmark/src/main/java/aisdata/Query2_Main.java similarity index 100% rename from flink-processor/src/main/java/aisdata/Query2_Main.java rename to benchmark/src/main/java/aisdata/Query2_Main.java diff --git a/flink-processor/src/main/java/aisdata/Query3_Main.java b/benchmark/src/main/java/aisdata/Query3_Main.java similarity index 100% rename from flink-processor/src/main/java/aisdata/Query3_Main.java rename to benchmark/src/main/java/aisdata/Query3_Main.java diff --git a/flink-processor/src/main/java/aisdata/Query4_Main.java b/benchmark/src/main/java/aisdata/Query4_Main.java similarity index 100% rename from flink-processor/src/main/java/aisdata/Query4_Main.java rename to benchmark/src/main/java/aisdata/Query4_Main.java diff --git a/flink-processor/src/main/java/aisdata/Query5_Main.java b/benchmark/src/main/java/aisdata/Query5_Main.java similarity index 100% rename from flink-processor/src/main/java/aisdata/Query5_Main.java rename to benchmark/src/main/java/aisdata/Query5_Main.java diff --git a/flink-processor/src/main/java/aisdata/Query6_Main.java b/benchmark/src/main/java/aisdata/Query6_Main.java similarity index 100% rename from flink-processor/src/main/java/aisdata/Query6_Main.java rename to benchmark/src/main/java/aisdata/Query6_Main.java diff --git a/flink-processor/src/main/java/aisdata/Query7_Main.java b/benchmark/src/main/java/aisdata/Query7_Main.java similarity index 100% rename from flink-processor/src/main/java/aisdata/Query7_Main.java rename to benchmark/src/main/java/aisdata/Query7_Main.java diff --git a/flink-processor/src/main/java/aisdata/Query8_Main.java b/benchmark/src/main/java/aisdata/Query8_Main.java similarity index 100% rename from flink-processor/src/main/java/aisdata/Query8_Main.java rename to benchmark/src/main/java/aisdata/Query8_Main.java diff --git a/flink-processor/src/main/java/aisdata/Query8_V2_Main.java b/benchmark/src/main/java/aisdata/Query8_V2_Main.java similarity index 100% rename from flink-processor/src/main/java/aisdata/Query8_V2_Main.java rename to benchmark/src/main/java/aisdata/Query8_V2_Main.java diff --git a/flink-processor/src/main/java/aisdata/Query9_Main.java b/benchmark/src/main/java/aisdata/Query9_Main.java similarity index 100% rename from flink-processor/src/main/java/aisdata/Query9_Main.java rename to benchmark/src/main/java/aisdata/Query9_Main.java diff --git a/flink-processor/src/main/java/aisdata/TrajectoryWindowFunction.java b/benchmark/src/main/java/aisdata/TrajectoryWindowFunction.java similarity index 100% rename from flink-processor/src/main/java/aisdata/TrajectoryWindowFunction.java rename to benchmark/src/main/java/aisdata/TrajectoryWindowFunction.java diff --git a/flink-processor/src/main/java/aisdata/a.txt b/benchmark/src/main/java/aisdata/a.txt similarity index 100% rename from flink-processor/src/main/java/aisdata/a.txt rename to benchmark/src/main/java/aisdata/a.txt diff --git a/flink-processor/src/main/java/aisdata/wait_for_it_may_past_logs.txt b/benchmark/src/main/java/aisdata/wait_for_it_may_past_logs.txt similarity index 100% rename from flink-processor/src/main/java/aisdata/wait_for_it_may_past_logs.txt rename to benchmark/src/main/java/aisdata/wait_for_it_may_past_logs.txt diff --git a/flink-processor/src/main/java/berlinmod/BerlinMODBenchmark.java b/benchmark/src/main/java/berlinmod/BerlinMODBenchmark.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/BerlinMODBenchmark.java rename to benchmark/src/main/java/berlinmod/BerlinMODBenchmark.java diff --git a/flink-processor/src/main/java/berlinmod/BerlinMODCorpus.java b/benchmark/src/main/java/berlinmod/BerlinMODCorpus.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/BerlinMODCorpus.java rename to benchmark/src/main/java/berlinmod/BerlinMODCorpus.java diff --git a/flink-processor/src/main/java/berlinmod/BerlinMODDeserializationSchema.java b/benchmark/src/main/java/berlinmod/BerlinMODDeserializationSchema.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/BerlinMODDeserializationSchema.java rename to benchmark/src/main/java/berlinmod/BerlinMODDeserializationSchema.java diff --git a/flink-processor/src/main/java/berlinmod/BerlinMODParity.java b/benchmark/src/main/java/berlinmod/BerlinMODParity.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/BerlinMODParity.java rename to benchmark/src/main/java/berlinmod/BerlinMODParity.java diff --git a/flink-processor/src/main/java/berlinmod/BerlinMODQ2Main.java b/benchmark/src/main/java/berlinmod/BerlinMODQ2Main.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/BerlinMODQ2Main.java rename to benchmark/src/main/java/berlinmod/BerlinMODQ2Main.java diff --git a/flink-processor/src/main/java/berlinmod/BerlinMODQ3Main.java b/benchmark/src/main/java/berlinmod/BerlinMODQ3Main.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/BerlinMODQ3Main.java rename to benchmark/src/main/java/berlinmod/BerlinMODQ3Main.java diff --git a/flink-processor/src/main/java/berlinmod/BerlinMODTrip.java b/benchmark/src/main/java/berlinmod/BerlinMODTrip.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/BerlinMODTrip.java rename to benchmark/src/main/java/berlinmod/BerlinMODTrip.java diff --git a/flink-processor/src/main/java/berlinmod/Haversine.java b/benchmark/src/main/java/berlinmod/Haversine.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Haversine.java rename to benchmark/src/main/java/berlinmod/Haversine.java diff --git a/flink-processor/src/main/java/berlinmod/MEOSBridge.java b/benchmark/src/main/java/berlinmod/MEOSBridge.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/MEOSBridge.java rename to benchmark/src/main/java/berlinmod/MEOSBridge.java diff --git a/flink-processor/src/main/java/berlinmod/PointOfInterest.java b/benchmark/src/main/java/berlinmod/PointOfInterest.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/PointOfInterest.java rename to benchmark/src/main/java/berlinmod/PointOfInterest.java diff --git a/flink-processor/src/main/java/berlinmod/Q1ContinuousFunction.java b/benchmark/src/main/java/berlinmod/Q1ContinuousFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q1ContinuousFunction.java rename to benchmark/src/main/java/berlinmod/Q1ContinuousFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q1SnapshotFunction.java b/benchmark/src/main/java/berlinmod/Q1SnapshotFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q1SnapshotFunction.java rename to benchmark/src/main/java/berlinmod/Q1SnapshotFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q1WindowedFunction.java b/benchmark/src/main/java/berlinmod/Q1WindowedFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q1WindowedFunction.java rename to benchmark/src/main/java/berlinmod/Q1WindowedFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q2ContinuousFunction.java b/benchmark/src/main/java/berlinmod/Q2ContinuousFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q2ContinuousFunction.java rename to benchmark/src/main/java/berlinmod/Q2ContinuousFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q2SnapshotFunction.java b/benchmark/src/main/java/berlinmod/Q2SnapshotFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q2SnapshotFunction.java rename to benchmark/src/main/java/berlinmod/Q2SnapshotFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q2WindowedFunction.java b/benchmark/src/main/java/berlinmod/Q2WindowedFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q2WindowedFunction.java rename to benchmark/src/main/java/berlinmod/Q2WindowedFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q3ContinuousFunction.java b/benchmark/src/main/java/berlinmod/Q3ContinuousFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q3ContinuousFunction.java rename to benchmark/src/main/java/berlinmod/Q3ContinuousFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q3SnapshotFunction.java b/benchmark/src/main/java/berlinmod/Q3SnapshotFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q3SnapshotFunction.java rename to benchmark/src/main/java/berlinmod/Q3SnapshotFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q3WindowedFunction.java b/benchmark/src/main/java/berlinmod/Q3WindowedFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q3WindowedFunction.java rename to benchmark/src/main/java/berlinmod/Q3WindowedFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q4ContinuousFunction.java b/benchmark/src/main/java/berlinmod/Q4ContinuousFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q4ContinuousFunction.java rename to benchmark/src/main/java/berlinmod/Q4ContinuousFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q4SnapshotFunction.java b/benchmark/src/main/java/berlinmod/Q4SnapshotFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q4SnapshotFunction.java rename to benchmark/src/main/java/berlinmod/Q4SnapshotFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q4WindowedFunction.java b/benchmark/src/main/java/berlinmod/Q4WindowedFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q4WindowedFunction.java rename to benchmark/src/main/java/berlinmod/Q4WindowedFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q5ContinuousFunction.java b/benchmark/src/main/java/berlinmod/Q5ContinuousFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q5ContinuousFunction.java rename to benchmark/src/main/java/berlinmod/Q5ContinuousFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q5SnapshotFunction.java b/benchmark/src/main/java/berlinmod/Q5SnapshotFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q5SnapshotFunction.java rename to benchmark/src/main/java/berlinmod/Q5SnapshotFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q5WindowedFunction.java b/benchmark/src/main/java/berlinmod/Q5WindowedFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q5WindowedFunction.java rename to benchmark/src/main/java/berlinmod/Q5WindowedFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q6ContinuousFunction.java b/benchmark/src/main/java/berlinmod/Q6ContinuousFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q6ContinuousFunction.java rename to benchmark/src/main/java/berlinmod/Q6ContinuousFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q6SnapshotFunction.java b/benchmark/src/main/java/berlinmod/Q6SnapshotFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q6SnapshotFunction.java rename to benchmark/src/main/java/berlinmod/Q6SnapshotFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q6WindowedFunction.java b/benchmark/src/main/java/berlinmod/Q6WindowedFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q6WindowedFunction.java rename to benchmark/src/main/java/berlinmod/Q6WindowedFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q7ContinuousFunction.java b/benchmark/src/main/java/berlinmod/Q7ContinuousFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q7ContinuousFunction.java rename to benchmark/src/main/java/berlinmod/Q7ContinuousFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q7SnapshotFunction.java b/benchmark/src/main/java/berlinmod/Q7SnapshotFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q7SnapshotFunction.java rename to benchmark/src/main/java/berlinmod/Q7SnapshotFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q7WindowedFunction.java b/benchmark/src/main/java/berlinmod/Q7WindowedFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q7WindowedFunction.java rename to benchmark/src/main/java/berlinmod/Q7WindowedFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q8ContinuousFunction.java b/benchmark/src/main/java/berlinmod/Q8ContinuousFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q8ContinuousFunction.java rename to benchmark/src/main/java/berlinmod/Q8ContinuousFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q8SnapshotFunction.java b/benchmark/src/main/java/berlinmod/Q8SnapshotFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q8SnapshotFunction.java rename to benchmark/src/main/java/berlinmod/Q8SnapshotFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q8WindowedFunction.java b/benchmark/src/main/java/berlinmod/Q8WindowedFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q8WindowedFunction.java rename to benchmark/src/main/java/berlinmod/Q8WindowedFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q9ContinuousFunction.java b/benchmark/src/main/java/berlinmod/Q9ContinuousFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q9ContinuousFunction.java rename to benchmark/src/main/java/berlinmod/Q9ContinuousFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q9SnapshotFunction.java b/benchmark/src/main/java/berlinmod/Q9SnapshotFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q9SnapshotFunction.java rename to benchmark/src/main/java/berlinmod/Q9SnapshotFunction.java diff --git a/flink-processor/src/main/java/berlinmod/Q9WindowedFunction.java b/benchmark/src/main/java/berlinmod/Q9WindowedFunction.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/Q9WindowedFunction.java rename to benchmark/src/main/java/berlinmod/Q9WindowedFunction.java diff --git a/flink-processor/src/main/java/berlinmod/SegmentDistance.java b/benchmark/src/main/java/berlinmod/SegmentDistance.java similarity index 100% rename from flink-processor/src/main/java/berlinmod/SegmentDistance.java rename to benchmark/src/main/java/berlinmod/SegmentDistance.java diff --git a/flink-processor/src/main/java/sedona/aisdata/SedonaQuery1_Main.java b/benchmark/src/main/java/sedona/aisdata/SedonaQuery1_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/aisdata/SedonaQuery1_Main.java rename to benchmark/src/main/java/sedona/aisdata/SedonaQuery1_Main.java diff --git a/flink-processor/src/main/java/sedona/aisdata/SedonaQuery2_Main.java b/benchmark/src/main/java/sedona/aisdata/SedonaQuery2_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/aisdata/SedonaQuery2_Main.java rename to benchmark/src/main/java/sedona/aisdata/SedonaQuery2_Main.java diff --git a/flink-processor/src/main/java/sedona/aisdata/SedonaQuery3_Main.java b/benchmark/src/main/java/sedona/aisdata/SedonaQuery3_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/aisdata/SedonaQuery3_Main.java rename to benchmark/src/main/java/sedona/aisdata/SedonaQuery3_Main.java diff --git a/flink-processor/src/main/java/sedona/aisdata/SedonaQuery4_Main.java b/benchmark/src/main/java/sedona/aisdata/SedonaQuery4_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/aisdata/SedonaQuery4_Main.java rename to benchmark/src/main/java/sedona/aisdata/SedonaQuery4_Main.java diff --git a/flink-processor/src/main/java/sedona/aisdata/SedonaQuery5_Main.java b/benchmark/src/main/java/sedona/aisdata/SedonaQuery5_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/aisdata/SedonaQuery5_Main.java rename to benchmark/src/main/java/sedona/aisdata/SedonaQuery5_Main.java diff --git a/flink-processor/src/main/java/sedona/aisdata/SedonaQuery6_Main.java b/benchmark/src/main/java/sedona/aisdata/SedonaQuery6_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/aisdata/SedonaQuery6_Main.java rename to benchmark/src/main/java/sedona/aisdata/SedonaQuery6_Main.java diff --git a/flink-processor/src/main/java/sedona/aisdata/SedonaQuery7_Main.java b/benchmark/src/main/java/sedona/aisdata/SedonaQuery7_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/aisdata/SedonaQuery7_Main.java rename to benchmark/src/main/java/sedona/aisdata/SedonaQuery7_Main.java diff --git a/flink-processor/src/main/java/sedona/aisdata/SedonaQuery8_Main.java b/benchmark/src/main/java/sedona/aisdata/SedonaQuery8_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/aisdata/SedonaQuery8_Main.java rename to benchmark/src/main/java/sedona/aisdata/SedonaQuery8_Main.java diff --git a/flink-processor/src/main/java/sedona/aisdata/SedonaQuery9_Main.java b/benchmark/src/main/java/sedona/aisdata/SedonaQuery9_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/aisdata/SedonaQuery9_Main.java rename to benchmark/src/main/java/sedona/aisdata/SedonaQuery9_Main.java diff --git a/flink-processor/src/main/java/sedona/sncbdata/SedonaQuery1_Main.java b/benchmark/src/main/java/sedona/sncbdata/SedonaQuery1_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/sncbdata/SedonaQuery1_Main.java rename to benchmark/src/main/java/sedona/sncbdata/SedonaQuery1_Main.java diff --git a/flink-processor/src/main/java/sedona/sncbdata/SedonaQuery2_Main.java b/benchmark/src/main/java/sedona/sncbdata/SedonaQuery2_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/sncbdata/SedonaQuery2_Main.java rename to benchmark/src/main/java/sedona/sncbdata/SedonaQuery2_Main.java diff --git a/flink-processor/src/main/java/sedona/sncbdata/SedonaQuery3_Main.java b/benchmark/src/main/java/sedona/sncbdata/SedonaQuery3_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/sncbdata/SedonaQuery3_Main.java rename to benchmark/src/main/java/sedona/sncbdata/SedonaQuery3_Main.java diff --git a/flink-processor/src/main/java/sedona/sncbdata/SedonaQuery4_Main.java b/benchmark/src/main/java/sedona/sncbdata/SedonaQuery4_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/sncbdata/SedonaQuery4_Main.java rename to benchmark/src/main/java/sedona/sncbdata/SedonaQuery4_Main.java diff --git a/flink-processor/src/main/java/sedona/sncbdata/SedonaQuery5_Main.java b/benchmark/src/main/java/sedona/sncbdata/SedonaQuery5_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/sncbdata/SedonaQuery5_Main.java rename to benchmark/src/main/java/sedona/sncbdata/SedonaQuery5_Main.java diff --git a/flink-processor/src/main/java/sedona/sncbdata/SedonaQuery6_Main.java b/benchmark/src/main/java/sedona/sncbdata/SedonaQuery6_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/sncbdata/SedonaQuery6_Main.java rename to benchmark/src/main/java/sedona/sncbdata/SedonaQuery6_Main.java diff --git a/flink-processor/src/main/java/sedona/sncbdata/SedonaQuery7_Main.java b/benchmark/src/main/java/sedona/sncbdata/SedonaQuery7_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/sncbdata/SedonaQuery7_Main.java rename to benchmark/src/main/java/sedona/sncbdata/SedonaQuery7_Main.java diff --git a/flink-processor/src/main/java/sedona/sncbdata/SedonaQuery8_Main.java b/benchmark/src/main/java/sedona/sncbdata/SedonaQuery8_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/sncbdata/SedonaQuery8_Main.java rename to benchmark/src/main/java/sedona/sncbdata/SedonaQuery8_Main.java diff --git a/flink-processor/src/main/java/sedona/sncbdata/SedonaQuery9_Main.java b/benchmark/src/main/java/sedona/sncbdata/SedonaQuery9_Main.java similarity index 100% rename from flink-processor/src/main/java/sedona/sncbdata/SedonaQuery9_Main.java rename to benchmark/src/main/java/sedona/sncbdata/SedonaQuery9_Main.java diff --git a/flink-processor/src/main/java/sncbdata/Query1_Main.java b/benchmark/src/main/java/sncbdata/Query1_Main.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/Query1_Main.java rename to benchmark/src/main/java/sncbdata/Query1_Main.java diff --git a/flink-processor/src/main/java/sncbdata/Query2_Main.java b/benchmark/src/main/java/sncbdata/Query2_Main.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/Query2_Main.java rename to benchmark/src/main/java/sncbdata/Query2_Main.java diff --git a/flink-processor/src/main/java/sncbdata/Query3_Main.java b/benchmark/src/main/java/sncbdata/Query3_Main.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/Query3_Main.java rename to benchmark/src/main/java/sncbdata/Query3_Main.java diff --git a/flink-processor/src/main/java/sncbdata/Query4_Main.java b/benchmark/src/main/java/sncbdata/Query4_Main.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/Query4_Main.java rename to benchmark/src/main/java/sncbdata/Query4_Main.java diff --git a/flink-processor/src/main/java/sncbdata/Query5_Main.java b/benchmark/src/main/java/sncbdata/Query5_Main.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/Query5_Main.java rename to benchmark/src/main/java/sncbdata/Query5_Main.java diff --git a/flink-processor/src/main/java/sncbdata/Query6_Main.java b/benchmark/src/main/java/sncbdata/Query6_Main.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/Query6_Main.java rename to benchmark/src/main/java/sncbdata/Query6_Main.java diff --git a/flink-processor/src/main/java/sncbdata/Query7_Main.java b/benchmark/src/main/java/sncbdata/Query7_Main.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/Query7_Main.java rename to benchmark/src/main/java/sncbdata/Query7_Main.java diff --git a/flink-processor/src/main/java/sncbdata/Query8_Main.java b/benchmark/src/main/java/sncbdata/Query8_Main.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/Query8_Main.java rename to benchmark/src/main/java/sncbdata/Query8_Main.java diff --git a/flink-processor/src/main/java/sncbdata/Query8_V2_Main.java b/benchmark/src/main/java/sncbdata/Query8_V2_Main.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/Query8_V2_Main.java rename to benchmark/src/main/java/sncbdata/Query8_V2_Main.java diff --git a/flink-processor/src/main/java/sncbdata/Query9_Main.java b/benchmark/src/main/java/sncbdata/Query9_Main.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/Query9_Main.java rename to benchmark/src/main/java/sncbdata/Query9_Main.java diff --git a/flink-processor/src/main/java/sncbdata/SNCBData.java b/benchmark/src/main/java/sncbdata/SNCBData.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/SNCBData.java rename to benchmark/src/main/java/sncbdata/SNCBData.java diff --git a/flink-processor/src/main/java/sncbdata/SNCBDataDeserializationSchema.java b/benchmark/src/main/java/sncbdata/SNCBDataDeserializationSchema.java similarity index 100% rename from flink-processor/src/main/java/sncbdata/SNCBDataDeserializationSchema.java rename to benchmark/src/main/java/sncbdata/SNCBDataDeserializationSchema.java diff --git a/flink-processor/src/main/resources/log4j.properties b/benchmark/src/main/resources/log4j.properties similarity index 100% rename from flink-processor/src/main/resources/log4j.properties rename to benchmark/src/main/resources/log4j.properties diff --git a/flink-processor/src/test/java/berlinmod/BerlinMODBenchmarkTest.java b/benchmark/src/test/java/berlinmod/BerlinMODBenchmarkTest.java similarity index 100% rename from flink-processor/src/test/java/berlinmod/BerlinMODBenchmarkTest.java rename to benchmark/src/test/java/berlinmod/BerlinMODBenchmarkTest.java diff --git a/flink-processor/src/test/java/berlinmod/BerlinMODSetSetJoinTest.java b/benchmark/src/test/java/berlinmod/BerlinMODSetSetJoinTest.java similarity index 100% rename from flink-processor/src/test/java/berlinmod/BerlinMODSetSetJoinTest.java rename to benchmark/src/test/java/berlinmod/BerlinMODSetSetJoinTest.java diff --git a/flink-processor/wait-for-it.sh b/benchmark/wait-for-it.sh similarity index 100% rename from flink-processor/wait-for-it.sh rename to benchmark/wait-for-it.sh diff --git a/binding/pom.xml b/binding/pom.xml new file mode 100644 index 0000000..b15db0f --- /dev/null +++ b/binding/pom.xml @@ -0,0 +1,125 @@ + + + 4.0.0 + + + org.mobilitydb.flink + mobility-flink-parent + 1.0-SNAPSHOT + + + mobility-flink-binding + + + + + + org.apache.flink + flink-streaming-java + ${flink.version} + + + org.apache.flink + flink-core + ${flink.version} + + + org.apache.flink + flink-clients + ${flink.version} + + + + org.jmeos + meos + ${jmeos.version} + + + com.github.jnr + jnr-ffi + ${jnr.version} + + + com.github.jnr + jnr-x86asm + 1.0.2 + + + com.github.jnr + jnr-constants + 0.9.12 + + + + org.slf4j + slf4j-api + 1.7.30 + + + org.slf4j + slf4j-simple + 1.7.30 + test + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + test + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 3.1.0 + + + generate-facades + generate-sources + exec + + python3 + + ${project.basedir}/../tools/codegen_jvm.py + --engine + flink + --catalog + ${project.basedir}/../tools/meos-idl.json + --jar + ${settings.localRepository}/org/jmeos/meos/${jmeos.version}/meos-${jmeos.version}.jar + --out + ${project.build.directory}/generated-facades + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.5.0 + + + add-generated-facades + generate-sources + add-source + + + ${project.build.directory}/generated-facades/src/main/java + + + + + + + + diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosBoundedStateMap.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosBoundedStateMap.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosBoundedStateMap.java rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosBoundedStateMap.java diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWiringRuntime.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWiringRuntime.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWiringRuntime.java rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWiringRuntime.java diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/README.md b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/README.md similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/README.md rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/README.md diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosAllTiersCapstoneDemo.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosAllTiersCapstoneDemo.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosAllTiersCapstoneDemo.java rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosAllTiersCapstoneDemo.java diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosBoundedStateDemoJob.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosBoundedStateDemoJob.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosBoundedStateDemoJob.java rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosBoundedStateDemoJob.java diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosCrossStreamDemoJob.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosCrossStreamDemoJob.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosCrossStreamDemoJob.java rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosCrossStreamDemoJob.java diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWindowedDemoJob.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWindowedDemoJob.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWindowedDemoJob.java rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWindowedDemoJob.java diff --git a/flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java rename to binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java diff --git a/flink-processor/src/main/java/org/mobilitydb/meos/MeosSetSetJoin.java b/binding/src/main/java/org/mobilitydb/meos/MeosSetSetJoin.java similarity index 100% rename from flink-processor/src/main/java/org/mobilitydb/meos/MeosSetSetJoin.java rename to binding/src/main/java/org/mobilitydb/meos/MeosSetSetJoin.java diff --git a/flink-processor/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java b/binding/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java similarity index 100% rename from flink-processor/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java rename to binding/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java diff --git a/flink-processor/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java b/binding/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java similarity index 100% rename from flink-processor/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java rename to binding/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java diff --git a/flink-processor/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java b/binding/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java similarity index 100% rename from flink-processor/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java rename to binding/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java diff --git a/flink-processor/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java b/binding/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java similarity index 100% rename from flink-processor/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java rename to binding/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java diff --git a/flink-processor/pom.xml b/flink-processor/pom.xml deleted file mode 100644 index 92d8079..0000000 --- a/flink-processor/pom.xml +++ /dev/null @@ -1,365 +0,0 @@ - - 4.0.0 - - Mariana - flink-kafka2postgres - 1.0-SNAPSHOT - - - aisdata.Query1_Main - 21 - 21 - UTF-8 - 2.0.0 - - 4.0.1-2.0 - - **/sedona/** - 2.13.4 - 5.8.2 - 3.2.0 - 2.17.2 - 21 - - true - /usr/local/lib - - - - - - org.apache.flink - flink-streaming-java - ${flink.version} - - - org.apache.flink - flink-clients - ${flink.version} - - - org.apache.flink - flink-core - ${flink.version} - - - org.apache.flink - flink-connector-kafka - ${flink.kafka.version} - - - - - - - org.apache.flink - flink-table-api-java-bridge - ${flink.version} - - - - - - org.apache.flink - flink-table-planner_2.12 - ${flink.version} - - - - - - - - - - org.locationtech.jts - jts-core - 1.18.1 - - - - - org.jmeos - meos - 1.0 - - - - - org.junit.jupiter - junit-jupiter-api - 5.7.0 - test - - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - 2.14.3 - - - - - org.slf4j - slf4j-api - 1.7.30 - - - org.slf4j - slf4j-simple - 1.7.30 - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j.version} - runtime - - - org.apache.logging.log4j - log4j-api - ${log4j.version} - runtime - - - org.apache.logging.log4j - log4j-core - ${log4j.version} - runtime - - - - - org.postgresql - postgresql - 42.3.1 - - - - - com.github.jnr - jnr-ffi - 2.1.10 - - - com.github.jnr - jnr-x86asm - 1.0.2 - - - com.github.jnr - jnr-constants - 0.9.12 - - - - - com.google.guava - guava - 32.1.3-jre - - - - - - - src/main/resources - - - ${project.basedir}/jmeos - - - - - - org.codehaus.mojo - exec-maven-plugin - 3.1.0 - - - generate-facades - generate-sources - exec - - python3 - - ${project.basedir}/../tools/codegen_jvm.py - --engine - flink - --catalog - ${project.basedir}/../tools/meos-idl.json - --jar - ${settings.localRepository}/org/jmeos/meos/1.0/meos-1.0.jar - --out - ${project.build.directory}/generated-facades - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.5.0 - - - add-generated-facades - generate-sources - add-source - - - ${project.build.directory}/generated-facades/src/main/java - - - - - - - - maven-compiler-plugin - 3.12.1 - - ${target.java.version} - - ${sedona.source.excludes} - - - ${sedona.source.excludes} - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.1 - - - package - - shade - - - - - *:* - - - META-INF.versions.9.module-info - org.apache.flink:flink-shaded-force-shading - com.google.code.findbugs:jsr305 - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - ${queryMainClass} - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.2.5 - - false - - ${meos.enabled} - - - ${meos.lib.dir} - - --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED - - - - - - - - - sedona - - nothing-excluded/** - - - - org.apache.sedona - sedona-flink-shaded_2.12 - 1.9.0 - - - org.datasyslab - geotools-wrapper - 1.8.1-33.1 - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..ba96119 --- /dev/null +++ b/pom.xml @@ -0,0 +1,67 @@ + + + 4.0.0 + + org.mobilitydb.flink + mobility-flink-parent + 1.0-SNAPSHOT + pom + + + binding + benchmark + + + + 21 + 21 + 21 + UTF-8 + 2.0.0 + + 4.0.1-2.0 + 2.13.4 + 5.7.0 + 3.2.0 + 2.17.2 + 1.0 + 2.1.10 + + true + /usr/local/lib + + + + + + + maven-compiler-plugin + 3.12.1 + + ${target.java.version} + + + + + maven-surefire-plugin + 3.2.5 + + false + + ${meos.enabled} + + + ${meos.lib.dir} + + --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED + + + + + +